Document how to make RET not indent.

* simple.el (newline): Doc fix.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3a46dd40e593e12427d2bb7ff6b369a450dc2391..ddb632edcf994bc46e3d4646a6cc9123dbadd7c0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2013-12-21  Richard Stallman  <rms@gnu.org>
+
+       * simple.el (newline): Doc fix.
+
 2013-12-21  Kenjiro NAKAYAMA <nakayamakenjiro@gmail.com>
 
         * net/eww.el (eww-list-histories, eww-list-histories)

diff --git a/lisp/simple.el b/lisp/simple.el
index 5101bfb26f856ae77da4c542fde9b80a7c130592..d6e61fd209509fa7c38621551384c980186a7acb 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -382,10 +382,13 @@ Other major modes are defined by comparison with this one."
 If option `use-hard-newlines' is non-nil, the newline is marked with the
 text-property `hard'.
 With ARG, insert that many newlines.
-Call `auto-fill-function' if the current column number is greater
+
+To turn off indentation by this command, disable Electric Indent mode
+\(see \\[electric-indent-mode]).
+
+Calls `auto-fill-function' if the current column number is greater
 than the value of `fill-column' and ARG is nil.
-A non-nil INTERACTIVE argument means to run the `post-self-insert-hook',
-which by default will also indent the line (see `electric-indent-mode')."
+A non-nil INTERACTIVE argument means to run the `post-self-insert-hook'."
   (interactive "*P\np")
   (barf-if-buffer-read-only)
   ;; Call self-insert so that auto-fill, abbrev expansion etc. happens.