Index: modules/node/node.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.pages.inc,v
retrieving revision 1.118
diff -u -p -r1.118 node.pages.inc
--- modules/node/node.pages.inc	18 Mar 2010 06:50:37 -0000	1.118
+++ modules/node/node.pages.inc	23 Mar 2010 21:09:36 -0000
@@ -163,14 +163,18 @@ function node_form($form, &$form_state, 
     '#type' => 'checkbox',
     '#title' => t('Create new revision'),
     '#default_value' => $node->revision,
-    '#states' => array(
-      // Check the revision log checkbox when the log textarea is filled in.
+    '#access' => user_access('administer nodes'),
+  );
+  // Check the revision log checkbox when the log textarea is filled in.
+  // This must not happen if "Create new revision" is enabled by default, since
+  // the state would auto-disable the checkbox otherwise.
+  if (!$node->revision && $form['revision_information']['revision']['#access']) {
+    $form['revision_information']['revision']['#states'] = array(
       'checked' => array(
         'textarea[name="log"]' => array('empty' => FALSE),
       ),
-    ),
-    '#access' => user_access('administer nodes'),
-  );
+    );
+  }
   $form['revision_information']['log'] = array(
     '#type' => 'textarea',
     '#title' => t('Revision log message'),