bartronx7/guix
1
0
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2026-01-29 04:01:28 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
This reverts commit 54b5356488.

The supporting `lisp-fill-paragraphs-as-doc-string' variable in Emacs hasn't
been released yet.  To check, run this in an Emacs git checkout:

  git branch --contains 192355e54af91ad6e7d1343071a749e1ced29400

Change-Id: I3fc23ceb7bc22876d7d3a51a1e55c6965c45699f
This commit is contained in:
Maxim Cournoyer 2026-01-27 11:06:39 +09:00
parent 42fe5b361c
commit 476e0818c1
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
.dir-locals.el
View file

@ -98,9 +98,27 @@
((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'. The
;; following variable reverts its behavior to the previous one.
(lisp-fill-paragraphs-as-doc-string nil)
;; 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)))
;; This notably allows '(' in Paredit to not insert a space when the
;; preceding symbol is one of these.