diff options
author | Eli Zaretskii <eliz@gnu.org> | 2025-02-01 12:22:13 +0200 |
---|---|---|
committer | Eli Zaretskii <eliz@gnu.org> | 2025-02-01 12:22:13 +0200 |
commit | e067f2763fd52b78342b5c759205032227e82ebe (patch) | |
tree | 35fe3a066ede9d1b2096a9703c2e2bd5b9ac8b6a /lisp/emacs-lisp/lisp-mode.el | |
parent | 22ab03e155adc4df0623e3ee9c2cc56a228e148a (diff) | |
download | emacs-e067f2763fd52b78342b5c759205032227e82ebe.tar.gz emacs-e067f2763fd52b78342b5c759205032227e82ebe.tar.bz2 emacs-e067f2763fd52b78342b5c759205032227e82ebe.zip |
Rename a recently-added variable (bug#56197)
* 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.
Diffstat (limited to 'lisp/emacs-lisp/lisp-mode.el')
-rw-r--r-- | lisp/emacs-lisp/lisp-mode.el | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el index 3b1d34bf7cd..1349a5212ed 100644 --- a/lisp/emacs-lisp/lisp-mode.el +++ b/lisp/emacs-lisp/lisp-mode.el @@ -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. |