diff options
| author | Basil L. Contovounesios | 2019-07-17 13:05:42 +0100 |
|---|---|---|
| committer | Basil L. Contovounesios | 2019-10-08 00:10:19 +0100 |
| commit | 373ffc59317cb96e253a0b0939b921e9172b44ff (patch) | |
| tree | 8fbe9721a18f5f5e21ccc7932528075f82d45bbb /lisp | |
| parent | 3f9ad4e725788dff5eaafc4678286c9386302a17 (diff) | |
| download | emacs-373ffc59317cb96e253a0b0939b921e9172b44ff.tar.gz emacs-373ffc59317cb96e253a0b0939b921e9172b44ff.zip | |
Clarify docs on newline and auto-fill-mode
* doc/lispref/text.texi (Commands for Insertion):
* lisp/simple.el (newline): Do not mention conditions specific to
'do-auto-fill' under documentation of 'newline' (bug#36702).
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/simple.el | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lisp/simple.el b/lisp/simple.el index ecd7eb797e8..b5205dd7648 100644 --- a/lisp/simple.el +++ b/lisp/simple.el | |||
| @@ -500,17 +500,18 @@ If `electric-indent-mode' is enabled, this indents the final new line | |||
| 500 | that it adds, and reindents the preceding line. To just insert | 500 | that it adds, and reindents the preceding line. To just insert |
| 501 | a newline, use \\[electric-indent-just-newline]. | 501 | a newline, use \\[electric-indent-just-newline]. |
| 502 | 502 | ||
| 503 | Calls `auto-fill-function' if the current column number is greater | 503 | If `auto-fill-mode' is enabled, this may cause automatic line |
| 504 | than the value of `fill-column' and ARG is nil. | 504 | breaking of the preceding line. A non-nil ARG inhibits this. |
| 505 | |||
| 505 | A non-nil INTERACTIVE argument means to run the `post-self-insert-hook'." | 506 | A non-nil INTERACTIVE argument means to run the `post-self-insert-hook'." |
| 506 | (interactive "*P\np") | 507 | (interactive "*P\np") |
| 507 | (barf-if-buffer-read-only) | 508 | (barf-if-buffer-read-only) |
| 508 | ;; Call self-insert so that auto-fill, abbrev expansion etc. happens. | 509 | ;; Call self-insert so that auto-fill, abbrev expansion etc. happen. |
| 509 | ;; Set last-command-event to tell self-insert what to insert. | 510 | ;; Set last-command-event to tell self-insert what to insert. |
| 510 | (let* ((was-page-start (and (bolp) (looking-at page-delimiter))) | 511 | (let* ((was-page-start (and (bolp) (looking-at page-delimiter))) |
| 511 | (beforepos (point)) | 512 | (beforepos (point)) |
| 512 | (last-command-event ?\n) | 513 | (last-command-event ?\n) |
| 513 | ;; Don't auto-fill if we have a numeric argument. | 514 | ;; Don't auto-fill if we have a prefix argument. |
| 514 | (auto-fill-function (if arg nil auto-fill-function)) | 515 | (auto-fill-function (if arg nil auto-fill-function)) |
| 515 | (arg (prefix-numeric-value arg)) | 516 | (arg (prefix-numeric-value arg)) |
| 516 | (postproc | 517 | (postproc |