From c9fb789fe9eaa5dc0694ef14fe36e5aa821a646c Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Fri, 8 Jul 2022 23:29:52 -0400
Subject: .dir-locals.el: Restore Emacs 27 lisp-fill-paragraph behavior.

* .dir-locals.el (scheme-mode): Set fill-paragraph-function to a
lisp-fill-paragraph version that matches that of Emacs 27.
---
 .dir-locals.el | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/.dir-locals.el b/.dir-locals.el
index 9edabba5f8..565f7c48e7 100644
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -156,7 +156,31 @@
    ;; preceding symbol is one of these.
    (eval . (modify-syntax-entry ?~ "'"))
    (eval . (modify-syntax-entry ?$ "'"))
-   (eval . (modify-syntax-entry ?+ "'"))))
+   (eval . (modify-syntax-entry ?+ "'"))
+
+   ;; 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)))))
+
  (emacs-lisp-mode . ((indent-tabs-mode . nil)))
  (texinfo-mode    . ((indent-tabs-mode . nil)
                      (fill-column . 72))))
-- 
cgit v1.2.3

<a href='/guix/commit/?id=a7dbd38859ebb174e5d757645ba80bdc8048bee8'>root</a>/<a href='/guix/commit/.guix-authorizations?id=a7dbd38859ebb174e5d757645ba80bdc8048bee8'>.guix-authorizations</a></div><div class='content'><div class='cgit-panel'><b>diff options</b><form method='get'><input type='hidden' name='id' value='a7dbd38859ebb174e5d757645ba80bdc8048bee8'/><table><tr><td colspan='2'/></tr><tr><td class='label'>context:</td><td class='ctrl'><select name='context' onchange='this.form.submit();'><option value='1'>1</option><option value='2'>2</option><option value='3' selected='selected'>3</option><option value='4'>4</option><option value='5'>5</option><option value='6'>6</option><option value='7'>7</option><option value='8'>8</option><option value='9'>9</option><option value='10'>10</option><option value='15'>15</option><option value='20'>20</option><option value='25'>25</option><option value='30'>30</option><option value='35'>35</option><option value='40'>40</option></select></td></tr><tr><td class='label'>space:</td><td class='ctrl'><select name='ignorews' onchange='this.form.submit();'><option value='0' selected='selected'>include</option><option value='1'>ignore</option></select></td></tr><tr><td class='label'>mode:</td><td class='ctrl'><select name='dt' onchange='this.form.submit();'><option value='0' selected='selected'>unified</option><option value='1'>ssdiff</option><option value='2'>stat only</option></select></td></tr><tr><td/><td class='ctrl'><noscript><input type='submit' value='reload'/></noscript></td></tr></table></form></div><table summary='commit info' class='commit-info'>
<tr><th>author</th><td>Marius Bakke &lt;mbakke@fastmail.com&gt;</td><td class='right'>2020-04-17 15:45:32 +0200</td></tr>
<tr><th>committer</th><td>Marius Bakke &lt;mbakke@fastmail.com&gt;</td><td class='right'>2020-04-17 17:03:20 +0200</td></tr>
<tr><th>commit</th><td colspan='2' class='oid'><a href='/guix/commit/.guix-authorizations?id=a7dbd38859ebb174e5d757645ba80bdc8048bee8'>a7dbd38859ebb174e5d757645ba80bdc8048bee8</a> (<a href='/guix/patch/.guix-authorizations?id=a7dbd38859ebb174e5d757645ba80bdc8048bee8'>patch</a>)</td></tr>
<tr><th>tree</th><td colspan='2' class='oid'><a href='/guix/tree/?id=a7dbd38859ebb174e5d757645ba80bdc8048bee8'>a17fd97c19c33ba8717795deeca8114c2121392f</a> /<a href='/guix/tree/.guix-authorizations?id=a7dbd38859ebb174e5d757645ba80bdc8048bee8'>.guix-authorizations</a></td></tr>
<tr><th>parent</th><td colspan='2' class='oid'><a href='/guix/commit/.guix-authorizations?id=8fa4ac5be4d5f8a1e62635842b16486832ff49f1'>8fa4ac5be4d5f8a1e62635842b16486832ff49f1</a> (<a href='/guix/diff/.guix-authorizations?id=a7dbd38859ebb174e5d757645ba80bdc8048bee8&amp;id2=8fa4ac5be4d5f8a1e62635842b16486832ff49f1'>diff</a>)</td></tr><tr><th>download</th><td colspan='2' class='oid'><a href='/guix/snapshot/guix-a7dbd38859ebb174e5d757645ba80bdc8048bee8.tar.gz'>guix-a7dbd38859ebb174e5d757645ba80bdc8048bee8.tar.gz</a><br/><a href='/guix/snapshot/guix-a7dbd38859ebb174e5d757645ba80bdc8048bee8.zip'>guix-a7dbd38859ebb174e5d757645ba80bdc8048bee8.zip</a><br/></td></tr></table>
<div class='commit-subject'>gnu: ungoogled-chromium: Update to 81.0.4044.113-0.b484ad4 [fixes CVE-2020-6457].</div><div class='commit-msg'>* gnu/packages/chromium.scm (%chromium-version): Set to 81.0.4044.113.
(%chromium-origin): Update hash.
</div><div class='diffstat-header'><a href='/guix/diff/?id=a7dbd38859ebb174e5d757645ba80bdc8048bee8'>Diffstat</a> (limited to '.guix-authorizations')</div><table summary='diffstat' class='diffstat'></table><div class='diffstat-summary'>0 files changed, 0 insertions, 0 deletions</div><table summary='diff' class='diff'><tr><td></td></tr></table></div> <!-- class=content -->
                         <div class=footer>generated by
                             <a href="https://git.zx2c4.com/cgit/about/">
                                 cgit
                             </a>
                         </div>
                        </div> <!-- id=cgit -->
</body>
</html>