mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-06 06:20:55 -08:00
Code Issues Projects Releases Wiki Activity

Rename a recently-added variable (bug#56197)

Browse source 
* lisp/emacs-lisp/lisp-mode.el
(lisp-fill-paragraphs-as-doc-string): Renamed from
'lisp-fill-paragraph-as-displayed' and default value reversed.
(lisp-fill-paragraph): Adjust to the change.
* test/lisp/emacs-lisp/lisp-mode-tests.el
(lisp-fill-paragraph-as-displayed): Likewise.
This commit is contained in:
Eli Zaretskii 2025-02-01 12:22:13 +02:00
parent 22ab03e155
commit e067f2763f
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
lisp/emacs-lisp/lisp-mode.el
View file

@ -1431,16 +1431,17 @@ Any non-integer value means do not use a different value of
:group 'lisp
:version "30.1")
(defvar lisp-fill-paragraph-as-displayed nil
"Modify the behavior of `lisp-fill-paragraph'.
(defvar lisp-fill-paragraphs-as-doc-string t
"Whether `lisp-fill-paragraph' should fill strings as ELisp doc strings.
The default behavior of `lisp-fill-paragraph' is tuned for filling Emacs
Lisp doc strings, with their special treatment for the first line.
Particularly, strings are filled in a narrowed context to avoid filling
Specifically, strings are filled in a narrowed context to avoid filling
surrounding code, which means any leading indent is disregarded, which
can cause the filled string to extend passed the configured
`fill-column' variable value. If you would rather fill the string in
its original context and ensure the `fill-column' value is more strictly
respected, set this variable to true. Doing so makes
its original context, disregarding the special conventions of ELisp doc
strings, and want to ensure the `fill-column' value is more strictly
respected, set this variable to nil. Doing so makes
`lisp-fill-paragraph' behave as it used to in Emacs 27 and prior
versions.")
@ -1506,7 +1507,7 @@ and initial semicolons."
;; code.
(if (not string-start)
(lisp--fill-line-simple)
(unless lisp-fill-paragraph-as-displayed
(when lisp-fill-paragraphs-as-doc-string
;; If we're in a string, then narrow (roughly) to that
;; string before filling. This avoids filling Lisp
;; statements that follow the string.