~ruther/guix-local

54b535648886da6e5edbce042682b4e0c0999820 — Maxim Cournoyer 9 months ago 10482f7
maint: Clean-up .dir-locals.el a bit.

* .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
1 files changed, 3 insertions(+), 21 deletions(-)

M .dir-locals.el
M .dir-locals.el => .dir-locals.el +3 -21
@@ 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.