Index: menu.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/menu/menu.module,v
retrieving revision 1.150
diff -u -p -r1.150 menu.module
--- menu.module	26 Nov 2007 16:36:43 -0000	1.150
+++ menu.module	10 Dec 2007 22:05:29 -0000
@@ -319,7 +319,7 @@ function menu_nodeapi(&$node, $op) {
     case 'prepare':
       if (empty($node->menu)) {
         // Prepare the node for the edit form so that $node->menu always exists.
-        $menu_name = variable_get('menu_default_node_menu', 'navigation');
+        $menu_name = 'primary-links';
         $item = array();
         if (isset($node->nid)) {
           // Give priority to the default menu
@@ -396,8 +396,8 @@ function menu_form_alter(&$form, $form_s
     $options = menu_parent_options(menu_get_menus(), $item);
     $default = $item['menu_name'] .':'. $item['plid'];
     if (!isset($options[$default])) {
-      $default = 'navigation:0';
+       $default = 'primary-links:0';
     }
     $form['menu']['parent'] = array(
       '#type' => 'select',
       '#title' => t('Parent item'),