From: Glenn Morris <rgm@gnu.org>
Date: Thu, 6 Mar 2014 04:11:08 +0000 (-0800)
Subject: * lisp/simple.el (newline): Doc tweak.
X-Git-Tag: emacs-24.3.90~266
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=03bc753ef6410e0203886d48593f6f466873a53e;p=emacs.git

* lisp/simple.el (newline): Doc tweak.

* etc/NEWS: Related edit.
---

diff --git a/etc/NEWS b/etc/NEWS
index f0d1b95d10f..69e65cc55a1 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -351,6 +351,10 @@ means to always load the .elc file.
 
 ** 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 @@ mode in which typing <left>, <right>, <S-left>, and <S-right> adjusts
 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
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 04af3ca01a5..ae71a8f8e65 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2014-03-06  Glenn Morris  <rgm@gnu.org>
 
+	* simple.el (newline): Doc tweak.
+
 	* emacs-lisp/shadow.el (load-path-shadows-find):
 	Ignore dir-locals.  (Bug#12357)
 
diff --git a/lisp/simple.el b/lisp/simple.el
index 200e86596d7..f9447b1fff4 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -383,8 +383,9 @@ If option `use-hard-newlines' is non-nil, the newline is marked with the
 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.