diff options
| author | Andrea Corallo <akrl@sdf.org> | 2020-09-26 15:31:50 +0200 |
|---|---|---|
| committer | Andrea Corallo <akrl@sdf.org> | 2020-09-26 15:31:50 +0200 |
| commit | 06acf681d6fd8e2c5c6a9584b5df6b98eccda20b (patch) | |
| tree | 5cc7132156db6b77599a86072de21a036828bcf4 /lisp/emacs-lisp/eldoc.el | |
| parent | e5b052d60d905209c6cefcf18c620167ed946301 (diff) | |
| parent | e00936bf9f10cf44e1df71a7a11afd770e8a122a (diff) | |
| download | emacs-06acf681d6fd8e2c5c6a9584b5df6b98eccda20b.tar.gz emacs-06acf681d6fd8e2c5c6a9584b5df6b98eccda20b.tar.bz2 emacs-06acf681d6fd8e2c5c6a9584b5df6b98eccda20b.zip | |
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'lisp/emacs-lisp/eldoc.el')
| -rw-r--r-- | lisp/emacs-lisp/eldoc.el | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el index 8fc8db62220..9e38e5908ed 100644 --- a/lisp/emacs-lisp/eldoc.el +++ b/lisp/emacs-lisp/eldoc.el @@ -510,6 +510,10 @@ Honor most of `eldoc-echo-area-use-multiline-p'." (> (+ (length single-doc) (length single-doc-sym) 2) width)) single-doc) ((> 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 + (setq available (1+ available))) (with-current-buffer (eldoc-doc-buffer) (cl-loop initially |