summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/warnings.el
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2019-06-16 17:31:49 -0700
committerGlenn Morris <rgm@gnu.org>2019-06-16 17:37:21 -0700
commit9d702b4cd8da1c1907b02869067a50933716631b (patch)
tree303f0bd67411448281adf1dea9222573f0034980 /lisp/emacs-lisp/warnings.el
parent309743b465b569e4954e9c03c16fd675af5efc52 (diff)
downloademacs-9d702b4cd8da1c1907b02869067a50933716631b.tar.gz
Don't hard-code the fill-column for display-warning
* lisp/emacs-lisp/warnings.el (warning-fill-column): New variable. (display-warning): Use warning-fill-column. * doc/lispref/display.texi (Warning Variables): Mention warning-fill-column.
Diffstat (limited to 'lisp/emacs-lisp/warnings.el')
-rw-r--r--lisp/emacs-lisp/warnings.el12
1 files changed, 9 insertions, 3 deletions
diff --git a/lisp/emacs-lisp/warnings.el b/lisp/emacs-lisp/warnings.el
index 13ca605dd00..1207353ba30 100644
--- a/lisp/emacs-lisp/warnings.el
+++ b/lisp/emacs-lisp/warnings.el
@@ -153,6 +153,11 @@ also call that function before the next warning.")
(defvar warning-fill-prefix nil
"Non-nil means fill each warning text using this string as `fill-prefix'.")
+;; I don't see why it can't just use the buffer-local fill-column,
+;; but at least this is better than hard-coding 78.
+(defvar warning-fill-column 78
+ "Value to use for `fill-column' when filling warnings.")
+
;; The autoload cookie is so that programs can bind this variable
;; safely, testing the existing value, before they call one of the
;; warnings functions.
@@ -222,8 +227,9 @@ has to create the buffer, it disables undo in the buffer.
See the `warnings' custom group for user customization features.
-See also `warning-series', `warning-prefix-function' and
-`warning-fill-prefix' for additional programming features."
+See also `warning-series', `warning-prefix-function',
+`warning-fill-prefix', and `warning-fill-column' for additional
+programming features."
(if (not (or after-init-time noninteractive (daemonp)))
;; Ensure warnings that happen early in the startup sequence
;; are visible when startup completes (bug#20792).
@@ -271,7 +277,7 @@ See also `warning-series', `warning-prefix-function' and
(funcall newline)
(when (and warning-fill-prefix (not (string-match "\n" message)))
(let ((fill-prefix warning-fill-prefix)
- (fill-column 78))
+ (fill-column warning-fill-column))
(fill-region start (point))))
(setq end (point)))
(when (and (markerp warning-series)