Index: modules/node/content_types.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/content_types.inc,v
retrieving revision 1.115
diff -u -p -r1.115 content_types.inc
--- modules/node/content_types.inc	24 Jun 2010 22:23:06 -0000	1.115
+++ modules/node/content_types.inc	18 Jul 2010 06:12:53 -0000
@@ -207,13 +207,6 @@ function node_type_form($form, &$form_st
     '#default_value' => variable_get('node_submitted_' . $type->type, TRUE),
     '#description' => t('Author username and publish date will be displayed.'),
   );
-  $form['display']['teaser_length'] = array(
-    '#type' => 'select',
-    '#title' => t('Length of trimmed content'),
-    '#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.")
-  );
   $form['old_type'] = array(
     '#type' => 'value',
     '#value' => $type->type,
@@ -451,7 +444,6 @@ function node_type_delete_confirm($form,
 function node_type_delete_confirm_submit($form, &$form_state) {
   node_type_delete($form_state['values']['type']);
 
-  variable_del('teaser_length_' . $form_state['values']['type']);
   variable_del('node_preview_' . $form_state['values']['type']);
   $t_args = array('%name' => $form_state['values']['name']);
   drupal_set_message(t('The content type %name has been deleted.', $t_args));
Index: modules/node/node.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.install,v
retrieving revision 1.51
diff -u -p -r1.51 node.install
--- modules/node/node.install	14 May 2010 04:37:53 -0000	1.51
+++ modules/node/node.install	18 Jul 2010 06:12:53 -0000
@@ -496,10 +496,26 @@ function node_update_7006(&$sandbox) {
       ->fields('node_type')
       ->execute();
 
+    $default_trim_length = variable_get('teaser_length', 600);
     // Add body field instances for existing node types.
     foreach ($result as $node_type) {
       if ($node_type->has_body) {
         node_add_body_field($node_type, $node_type->body_label);
+        $trim_length = variable_get('teaser_length_' . $node_type->type, $default_trim_length);
+        $instance = field_info_instance('node', 'body', $node_type->type);
+        $instance_changed = FALSE;
+        foreach ($instance['display'] as $view_mode => $view_mode_info) {
+          if ($view_mode_info['type'] == 'text_trimmed' || $view_mode_info['type'] == 'text_summary_or_trimmed') {
+            if (!isset($view_mode_info['settings']['trim_length'])) {
+              $instance['display'][$view_mode]['settings']['trim_length'] = $trim_length;
+              $instance_changed = TRUE;
+            }
+          }
+        }
+        if ($instance_changed) {
+          field_update_instance($instance);
+        }
+        variable_del('teaser_length_' . $node_type->type);
       }
 
       $sandbox['node_types_info'][$node_type->type] = array(
Index: modules/node/node.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.test,v
retrieving revision 1.89
diff -u -p -r1.89 node.test
--- modules/node/node.test	8 Jul 2010 03:41:27 -0000	1.89
+++ modules/node/node.test	18 Jul 2010 06:12:54 -0000
@@ -565,11 +565,11 @@ class SummaryLengthTestCase extends Drup
     $expected = 'What is a Drupalism?';
     $this->assertRaw($expected, t('Check that the summary is 600 characters in length'), 'Node');
 
-    // Edit the teaser length for "Basic page" content type
-    $edit = array (
-      'teaser_length' => 200,
-    );
-    $this->drupalPost('admin/structure/types/manage/page', $edit, t('Save content type'));
+    // Change the teaser length for "Basic page" content type.
+    $instance = field_info_instance('node', 'body', $node->type);
+    $instance['display']['teaser']['settings']['trim_length'] = 200;
+    field_update_instance($instance);
+
     // Attempt to access the front page again and check if the summary is now only 200 characters in length.
     $this->drupalGet("node");
     $this->assertNoRaw($expected, t('Check that the summary is not longer than 200 characters'), 'Node');
@@ -1072,7 +1072,7 @@ class NodeTypeTestCase extends DrupalWeb
 
     $this->drupalGet('node/add/' . str_replace('_', '-', $type->name));
     $this->assertResponse(200, 'The new content type can be accessed at node/add.');
-    
+
     // Create a content type via the user interface.
     $web_user = $this->drupalCreateUser(array('bypass node access', 'administer content types'));
     $this->drupalLogin($web_user);