[Emacs-diffs] trunk r115671: Document how to make RET not indent.

[Richard M. Stallman]

------------------------------------------------------------
revno: 115671
revision-id: address@hidden
parent: address@hidden
author: Richard Stallman
committer: Richard Stallman <address@hidden>
branch nick: trunk
timestamp: Sat 2013-12-21 17:55:59 -0500
message:
  Document how to make RET not indent.
  
  * simple.el (newline): Doc fix.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/simple.el                 simple.el-20091113204419-o5vbwnq5f7feedwu-403

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-12-21 20:50:02 +0000
+++ b/lisp/ChangeLog    2013-12-21 22:55:59 +0000
@@ -1,3 +1,7 @@
+2013-12-21  Richard Stallman  <address@hidden>
+
+       * simple.el (newline): Doc fix.
+
 2013-12-21  Kenjiro NAKAYAMA <address@hidden>
 
         * net/eww.el (eww-list-histories, eww-list-histories)

=== modified file 'lisp/simple.el'
--- a/lisp/simple.el    2013-12-19 21:02:46 +0000
+++ b/lisp/simple.el    2013-12-21 22:55:59 +0000
@@ -382,10 +382,13 @@
 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.