[Emacs-diffs] trunk r116684: * lisp/simple.el (newline): Doc tweak.

[Glenn Morris]

------------------------------------------------------------
revno: 116684
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2014-03-05 20:11:08 -0800
message:
  * lisp/simple.el (newline): Doc tweak.
  
  * etc/NEWS: Related edit.
modified:
  etc/NEWS                       news-20100311060928-aoit31wvzf25yr1z-1
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/simple.el                 simple.el-20091113204419-o5vbwnq5f7feedwu-403

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2014-03-05 17:14:48 +0000
+++ b/etc/NEWS  2014-03-06 04:11:08 +0000
@@ -351,6 +351,10 @@
 
 ** Indentation changes
 
+*** `electric-indent-mode' is now enabled by default.
+E.g., typing RET reindents the current line and indents the new line.
+`C-j' inserts a newline but does not indent.
+
 +++
 *** The behavior of `C-x TAB' (`indent-rigidly') has changed.
 When invoked without a prefix argument, it now activates a transient
@@ -358,8 +362,6 @@
 the text indentation in the region.  Typing any other key resumes
 normal editing behavior.
 
-*** `electric-indent-mode' is enabled by default.
-
 +++
 *** `tab-stop-list' is now implicitly extended to infinity by repeating
 the last step.  Its default value is changed to nil, which means a tab

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-03-06 02:01:02 +0000
+++ b/lisp/ChangeLog    2014-03-06 04:11:08 +0000
@@ -1,5 +1,7 @@
 2014-03-06  Glenn Morris  <address@hidden>
 
+       * simple.el (newline): Doc tweak.
+
        * emacs-lisp/shadow.el (load-path-shadows-find):
        Ignore dir-locals.  (Bug#12357)
 

=== modified file 'lisp/simple.el'
--- a/lisp/simple.el    2014-03-04 03:14:11 +0000
+++ b/lisp/simple.el    2014-03-06 04:11:08 +0000
@@ -383,8 +383,9 @@
 text-property `hard'.
 With ARG, insert that many newlines.
 
-To turn off indentation by this command, disable Electric Indent mode
-\(see \\[electric-indent-mode]).
+If `electric-indent-mode' is enabled, this indents the final new line
+that it adds, and reindents the preceding line.  To just insert
+a newline, use \\[electric-indent-just-newline].
 
 Calls `auto-fill-function' if the current column number is greater
 than the value of `fill-column' and ARG is nil.