diff options
| author | Tom Tromey <tom@tromey.com> | 2017-08-09 16:06:23 -0600 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2017-08-09 16:06:23 -0600 |
| commit | 81656add8117e8d1b7faab18b330d0706462b433 (patch) | |
| tree | 39506c6f7a8afa723f742637fe3f7e3985789e1f /lisp/newcomment.el | |
| parent | 904be8c4cf8522a54a85542954bd553b6dbd0b64 (diff) | |
| download | emacs-81656add8117e8d1b7faab18b330d0706462b433.tar.gz emacs-81656add8117e8d1b7faab18b330d0706462b433.tar.bz2 emacs-81656add8117e8d1b7faab18b330d0706462b433.zip | |
Fix auto-filling regression
Bug#28003
* lisp/newcomment.el (comment-indent-new-line): Check
comment-auto-fill-only-comments. Reverts earlier change.
* lisp/simple.el (internal-auto-fill): Call auto-fill-function, not
do-auto-fill.
Diffstat (limited to 'lisp/newcomment.el')
| -rw-r--r-- | lisp/newcomment.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/newcomment.el b/lisp/newcomment.el index e3ee4dfab11..8772b52376d 100644 --- a/lisp/newcomment.el +++ b/lisp/newcomment.el @@ -1382,9 +1382,10 @@ unless optional argument SOFT is non-nil." (interactive) (comment-normalize-vars t) (let (compos comin) - ;; If we are not inside a comment don't do anything (unless no - ;; comment syntax is defined). + ;; If we are not inside a comment and we only auto-fill comments, + ;; don't do anything (unless no comment syntax is defined). (unless (and comment-start + comment-auto-fill-only-comments (not (called-interactively-p 'interactive)) (not (save-excursion (prog1 (setq compos (comment-beginning)) |