maint: Clean-up .dir-locals.el a bit.

54b53564 · Maxim Cournoyer <[email protected]> · 2025-07-18 11:15:28 +09:00

* .dir-locals.el (scheme-mode) <lisp-fill-paragraphs-as-doc-string>: Set new
variable to nil. Delete old fill-paragraph-function eval block.

Fixes: <https://bugs.gnu.org/79459>
Change-Id: I3cff48fe12f1662062d1a9342377d8f41a1ec550

Commit: 54b535648886da6e5edbce042682b4e0c0999820
Parents: 10482f73

Changes

1 files changed · +3 −21

File	Status	Add	Del	Content
.dir-locals.el	modified	+3	−21	View file

.dir-locals.el

View file

diff --git a/.dir-locals.el b/.dir-locals.el
index 7a06698..cea37fc 100644
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -98,27 +98,9 @@
   ((indent-tabs-mode . nil)
 
    ;; Emacs 28 changed the behavior of 'lisp-fill-paragraph', which causes the
-   ;; first line of package descriptions to extrude past 'fill-column', and
-   ;; somehow that is deemed more correct upstream (see:
-   ;; https://issues.guix.gnu.org/56197).
-   (eval . (progn
-             (require 'lisp-mode)
-             (defun emacs27-lisp-fill-paragraph (&optional justify)
-               (interactive "P")
-               (or (fill-comment-paragraph justify)
-                   (let ((paragraph-start
-                          (concat paragraph-start
-                                  "\\|\\s-*\\([(;\"]\\|\\s-:\\|`(\\|#'(\\)"))
-                         (paragraph-separate
-                          (concat paragraph-separate "\\|\\s-*\".*[,\\.]$"))
-                         (fill-column (if (and (integerp emacs-lisp-docstring-fill-column)
-                                               (derived-mode-p 'emacs-lisp-mode))
-                                          emacs-lisp-docstring-fill-column
-                                        fill-column)))
-                     (fill-paragraph justify))
-                   ;; Never return nil.
-                   t))
-             (setq-local fill-paragraph-function #'emacs27-lisp-fill-paragraph)))
+   ;; first line of package descriptions to extrude past 'fill-column'. The
+   ;; following variable reverts its behavior to the previous one.
+   (lisp-fill-paragraphs-as-doc-string nil)
 
    ;; This notably allows '(' in Paredit to not insert a space when the
    ;; preceding symbol is one of these.