diff options
| author | Richard M. Stallman | 2013-12-21 17:55:59 -0500 |
|---|---|---|
| committer | Richard M. Stallman | 2013-12-21 17:55:59 -0500 |
| commit | b51ad4cf0a4ff7d2140197980ef93e098899a906 (patch) | |
| tree | 8cb3daf753b6c9f6d190cf85fd494703efe3eff4 | |
| parent | dde4de31e00fc389ab64bba312491e31ea2cf305 (diff) | |
| download | emacs-b51ad4cf0a4ff7d2140197980ef93e098899a906.tar.gz emacs-b51ad4cf0a4ff7d2140197980ef93e098899a906.zip | |
Document how to make RET not indent.
* simple.el (newline): Doc fix.
| -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 @@ | |||
| 1 | 2013-12-21 Richard Stallman <rms@gnu.org> | ||
| 2 | |||
| 3 | * simple.el (newline): Doc fix. | ||
| 4 | |||
| 1 | 2013-12-21 Kenjiro NAKAYAMA <nakayamakenjiro@gmail.com> | 5 | 2013-12-21 Kenjiro NAKAYAMA <nakayamakenjiro@gmail.com> |
| 2 | 6 | ||
| 3 | * net/eww.el (eww-list-histories, eww-list-histories) | 7 | * 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." | |||
| 382 | If option `use-hard-newlines' is non-nil, the newline is marked with the | 382 | If option `use-hard-newlines' is non-nil, the newline is marked with the |
| 383 | text-property `hard'. | 383 | text-property `hard'. |
| 384 | With ARG, insert that many newlines. | 384 | With ARG, insert that many newlines. |
| 385 | Call `auto-fill-function' if the current column number is greater | 385 | |
| 386 | To turn off indentation by this command, disable Electric Indent mode | ||
| 387 | \(see \\[electric-indent-mode]). | ||
| 388 | |||
| 389 | Calls `auto-fill-function' if the current column number is greater | ||
| 386 | than the value of `fill-column' and ARG is nil. | 390 | than the value of `fill-column' and ARG is nil. |
| 387 | A non-nil INTERACTIVE argument means to run the `post-self-insert-hook', | 391 | A non-nil INTERACTIVE argument means to run the `post-self-insert-hook'." |
| 388 | which by default will also indent the line (see `electric-indent-mode')." | ||
| 389 | (interactive "*P\np") | 392 | (interactive "*P\np") |
| 390 | (barf-if-buffer-read-only) | 393 | (barf-if-buffer-read-only) |
| 391 | ;; Call self-insert so that auto-fill, abbrev expansion etc. happens. | 394 | ;; Call self-insert so that auto-fill, abbrev expansion etc. happens. |