Index: modules/node/content_types.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/content_types.inc,v
retrieving revision 1.85
diff -u -r1.85 content_types.inc
--- modules/node/content_types.inc	9 Aug 2009 01:15:33 -0000	1.85
+++ modules/node/content_types.inc	9 Aug 2009 08:02:24 -0000
@@ -179,13 +179,17 @@
     '#default_value' => variable_get('node_submitted_' . $type->type, TRUE),
     '#description' => t('Enable the <em>submitted by Username on date</em> text.'),
   );
-  $form['display']['teaser_length'] = array(
-    '#type' => 'select', 
-    '#title' => t('Length of trimmed posts'),
-    '#default_value' => variable_get('teaser_length_' . $type->type, 600),
-    '#options' => drupal_map_assoc(array(0, 200, 400, 600, 800, 1000, 1200, 1400, 1600, 1800, 2000), '_node_characters'),
-    '#description' => t("The maximum number of characters used in the trimmed version of content.")
-  );
+  if ($type->has_body) {
+    $instance = field_info_instance('body', $type->type);
+    $summary_length = isset($instance['display']['teaser']['settings']['summary_length']) ? $instance['display']['teaser']['settings']['summary_length'] : 600;
+    $form['display']['teaser_length'] = array(
+      '#type' => 'select', 
+      '#title' => t('Length of trimmed posts'),
+      '#default_value' => $summary_length,
+      '#options' => drupal_map_assoc(array(0, 200, 400, 600, 800, 1000, 1200, 1400, 1600, 1800, 2000), '_node_characters'),
+      '#description' => t("The maximum number of characters used in the trimmed version of content.")
+    );
+  }
   $form['old_type'] = array(
     '#type' => 'value',
     '#value' => $type->type,
@@ -298,6 +302,7 @@
   $type->custom = $form_state['values']['custom'];
   $type->modified = TRUE;
   $type->locked = $form_state['values']['locked'];
+  $type->summary_length = $form_state['values']['teaser_length'];
 
   if ($op == t('Delete content type')) {
     $form_state['redirect'] = 'admin/structure/node-type/' . str_replace('_', '-', $type->old_type) . '/delete';
Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.1095
diff -u -r1.1095 node.module
--- modules/node/node.module	8 Aug 2009 22:52:59 -0000	1.1095
+++ modules/node/node.module	9 Aug 2009 08:02:25 -0000
@@ -478,7 +478,7 @@
         'settings' => array('display_summary' => TRUE),
 
         // With no UI in core, we have to define default
-        // formatters for the teaser and full view.
+        // formatters for RSS, teaser and full view.
         // This may change if the method of handling displays
         // is changed or if a UI gets into core.
         'display' => array(
@@ -489,6 +489,12 @@
           'teaser' => array(
             'label' => 'hidden',
             'type' => 'text_summary_or_trimmed',
+            'settings' => array('summary_length' => $type->summary_length),
+          ),
+          'rss' => array(
+            'label' => 'hidden',
+            'type' => 'text_summary_or_trimmed',
+            'settings' => array('summary_length' => $type->summary_length),
           ),
         ),
       );
@@ -497,6 +503,8 @@
     else {
       $instance['label'] = $type->body_label;
       $instance['settings']['display_summary'] = TRUE;
+      $instance['display']['teaser']['settings']['summary_length'] = $type->summary_length;
+      $instance['display']['rss']['settings']['summary_length'] = $type->summary_length;
       field_update_instance($instance);
     }
   }
@@ -618,6 +626,7 @@
     $type->modified = 0;
     $type->locked = 1;
     $type->is_new = 1;
+    $type->summary_length = 600;
   }
 
   $new_type = clone $type;
Index: modules/node/node.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.install,v
retrieving revision 1.25
diff -u -r1.25 node.install
--- modules/node/node.install	27 Jul 2009 19:26:31 -0000	1.25
+++ modules/node/node.install	9 Aug 2009 08:02:24 -0000
@@ -525,7 +525,25 @@
   return $ret;
 }
 
+/**
+ * Move summary length from variable table to the body field data.
+ */
+function node_update_7007() {
 
+  // Get node type info for every invocation.
+  node_type_clear();
+  $node_types = node_type_get_types();
+  $body_types = array();
+  $teaser_length = variable_get('teaser_length', 600);
+  foreach ($node_types as $type => $info) {
+    if ($info->has_body) {
+      $info->summary_length = variable_get('teaser_length_' . $info->type, $teaser_length);
+      node_type_save($info);
+    }
+  }
+ 
+  return array();
+}
 
 /**
  * @} End of "defgroup updates-6.x-to-7.x"
Index: modules/field/modules/text/text.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/field/modules/text/text.module,v
retrieving revision 1.17
diff -u -r1.17 text.module
--- modules/field/modules/text/text.module	4 Aug 2009 06:38:56 -0000	1.17
+++ modules/field/modules/text/text.module	9 Aug 2009 08:02:24 -0000
@@ -255,6 +255,7 @@
     'text_trimmed' => array(
       'label' => t('Trimmed'),
       'field types' => array('text', 'text_long', 'text_with_summary'),
+      'settings' => array('summary_length' => 600),
     ),
 
     // The 'summary or trimmed' field formatter for text_with_summary
@@ -264,6 +265,7 @@
     'text_summary_or_trimmed' => array(
       'label' => t('Summary or trimmed'),
       'field types' => array('text_with_summary'),
+      'settings' => array('summary_length' => 600),
     ),
   );
 }
@@ -288,7 +290,8 @@
 function theme_field_formatter_text_trimmed($element) {
   $field = field_info_field($element['#field_name']);
   $instance = field_info_instance($element['#field_name'], $element['#bundle']);
-  return text_summary($element['#item']['safe'], $instance['settings']['text_processing'] ? $element['#item']['format'] : NULL);
+  $size = $element['#settings']['summary_length'];
+  return text_summary($element['#item']['safe'], $instance['settings']['text_processing'] ? $element['#item']['format'] : NULL, $size);
 }
 
 /**
@@ -305,7 +308,7 @@
     return $element['#item']['safe_summary'];
   }
   else {
-    $size = variable_get('teaser_length_' . $element['#bundle'], 600);
+    $size = $element['#settings']['summary_length'];
     return text_summary($element['#item']['safe'], $instance['settings']['text_processing'] ? $element['#item']['format'] : NULL, $size);
   }
 }