From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Fri, 5 Mar 2021 13:01:00 +0000 (+0100)
Subject: Actually fill the correct paragraph in `lisp-fill-paragraph'
X-Git-Tag: emacs-28.0.90~3432
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ef61a6b636156a31a20bb4f002015e4e4611c041;p=emacs.git

Actually fill the correct paragraph in `lisp-fill-paragraph'

* lisp/emacs-lisp/lisp-mode.el (lisp-fill-paragraph): Fix previous
change here by actually filling the correct paragraph (bug#28937).
---

diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index 257ac7412e8..4aa8ddcfa11 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -1371,7 +1371,8 @@ and initial semicolons."
                            fill-column)))
         (save-restriction
           (save-excursion
-          (let ((ppss (syntax-ppss)))
+          (let ((ppss (syntax-ppss))
+                (start (point)))
             ;; If we're in a string, then narrow (roughly) to that
             ;; string before filling.  This avoids filling Lisp
             ;; statements that follow the string.
@@ -1386,6 +1387,8 @@ and initial semicolons."
                         t))
                 (narrow-to-region (ppss-comment-or-string-start ppss)
                                   (point))))
+            ;; Move back to where we were.
+            (goto-char start)
 	    (fill-paragraph justify)))))
       ;; Never return nil.
       t))