From: Tom Tromey <tom@tromey.com>
Date: Wed, 9 Aug 2017 22:06:23 +0000 (-0600)
Subject: Fix auto-filling regression
X-Git-Tag: emacs-26.0.90~493
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=81656add8117e8d1b7faab18b330d0706462b433;p=emacs.git

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.
---

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))
diff --git a/lisp/simple.el b/lisp/simple.el
index 9838f1644f8..933ffc55a6b 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -7243,7 +7243,7 @@ unless optional argument SOFT is non-nil."
   (when (or (not comment-start)
             (not comment-auto-fill-only-comments)
             (nth 4 (syntax-ppss)))
-    (do-auto-fill)))
+    (funcall auto-fill-function)))
 
 (defvar normal-auto-fill-function 'do-auto-fill
   "The function to use for `auto-fill-function' if Auto Fill mode is turned on.