diff options
| author | Stefan Kangas <stefan@marxist.se> | 2021-09-28 13:30:02 +0200 |
|---|---|---|
| committer | Stefan Kangas <stefan@marxist.se> | 2021-09-28 14:15:00 +0200 |
| commit | b27a8f15549f12b363acfde8101849af10e9b401 (patch) | |
| tree | 8729a391bb177a8e5ef3763b7e5313e0af8549ae /lisp/emacs-lisp | |
| parent | 73b2b9f67acd82571ed0d250c5ba3282a4f6752a (diff) | |
| download | emacs-b27a8f15549f12b363acfde8101849af10e9b401.tar.gz emacs-b27a8f15549f12b363acfde8101849af10e9b401.tar.bz2 emacs-b27a8f15549f12b363acfde8101849af10e9b401.zip | |
Signal error on newline in internal--format-docstring-line
* lisp/subr.el (internal--format-docstring-line): Signal error
when trying to fill a line containing a newline.
* lisp/cedet/semantic/decorate/mode.el
(define-semantic-decoration-style):
* lisp/emacs-lisp/easy-mmode.el (define-globalized-minor-mode):
Don't pass newlines to 'internal--format-docstring-line'.
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/easy-mmode.el | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el index 0e4d6eeb7bb..d37bca24a0f 100644 --- a/lisp/emacs-lisp/easy-mmode.el +++ b/lisp/emacs-lisp/easy-mmode.el @@ -496,15 +496,17 @@ on if the hook has explicitly disabled it. (define-minor-mode ,global-mode ,(concat (format "Toggle %s in all buffers.\n" pretty-name) (internal--format-docstring-line - "With prefix ARG, enable %s if ARG is positive; otherwise, \ -disable it.\n\n" + (concat "With prefix ARG, enable %s if ARG is positive; " + "otherwise, disable it.") pretty-global-name) + "\n\n" "If called from Lisp, toggle the mode if ARG is `toggle'. Enable the mode if ARG is nil, omitted, or is a positive number. Disable the mode if ARG is a negative number.\n\n" (internal--format-docstring-line - "%s is enabled in all buffers where `%s' would do it.\n\n" + "%s is enabled in all buffers where `%s' would do it." pretty-name turn-on) + "\n\n" (internal--format-docstring-line "See `%s' for more information on %s." mode pretty-name) |