diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/simple.el | 9 |
2 files changed, 10 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3a46dd40e59..ddb632edcf9 100644 --- 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 5101bfb26f8..d6e61fd2095 100644 --- 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. |