From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Tue, 22 Sep 2020 14:20:05 +0000 (+0200)
Subject: Fix off-by-one error in eldoc--handle-docs
X-Git-Tag: emacs-28.0.90~5932
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=73f77558ccd5f0d83af294676eedfce3aa1bb4cb;p=emacs.git

Fix off-by-one error in eldoc--handle-docs

* lisp/emacs-lisp/eldoc.el (eldoc--handle-docs): We have one extra
line to use if we don't show the truncation message (bug#43543).
---

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