From 77c39284259fe7a6bd6935bbe78a799dd9191c43 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jo=C3=A3o=20T=C3=A1vora?= Date: Sun, 4 Oct 2020 12:19:47 +0100 Subject: [PATCH] Rename ElDoc user option controlling display of truncation notice The new name makes it consistent with other variables controlling the display of ElDoc documentation in the echo area. Per bug#43543. * etc/NEWS (Eldoc): Rename eldoc-display-truncation-message to eldoc-echo-area-display-truncation-message. * lisp/emacs-lisp/eldoc.el (eldoc-echo-area-display-truncation-message): Rename from eldoc-display-truncation-message. (eldoc-display-in-echo-area): Use new variable name. --- etc/NEWS | 2 +- lisp/emacs-lisp/eldoc.el | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/etc/NEWS b/etc/NEWS index 8aa27fd651e..7dbd3d51fa4 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -636,7 +636,7 @@ definition. ** ElDoc +++ -*** New user option 'eldoc-display-truncation-message'. +*** New user option 'eldoc-echo-area-display-truncation-message'. If non-nil (the default), eldoc will display a message saying something like "(Documentation truncated. Use `M-x eldoc-doc-buffer' to see rest)" when a message has been truncated. If nil, truncated diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el index 6c6570f847a..bad9eabe64d 100644 --- a/lisp/emacs-lisp/eldoc.el +++ b/lisp/emacs-lisp/eldoc.el @@ -67,7 +67,7 @@ If this variable is set to 0, no idle time is required." Changing the value requires toggling `eldoc-mode'." :type 'boolean) -(defcustom eldoc-display-truncation-message t +(defcustom eldoc-echo-area-display-truncation-message t "If non-nil, provide verbose help when a message has been truncated. If nil, truncated messages will just have \"...\" appended." :type 'boolean @@ -544,7 +544,7 @@ Honor `eldoc-echo-area-use-multiline-p' and ((> available 1) ;; The message takes one extra line, so if we don't ;; display that, we have one extra line to use. - (unless eldoc-display-truncation-message + (unless eldoc-echo-area-display-truncation-message (setq available (1+ available))) ;; Else we format the *eldoc* buffer, then use some of ;; its contents top section. I'm pretty sure smarter @@ -570,7 +570,7 @@ Honor `eldoc-echo-area-use-multiline-p' and (buffer-substring (point-min) (point)) (and truncated - (if eldoc-display-truncation-message + (if eldoc-echo-area-display-truncation-message (format "\n(Documentation truncated. Use `%s' to see rest)" (substitute-command-keys "\\[eldoc-doc-buffer]")) -- 2.39.2