branch: externals/eldoc-eval
commit a0d5c41505943d8a3073e41f37ced80e8ac7b97f
Author: Thierry Volpiatto <[email protected]>
Commit: Thierry Volpiatto <[email protected]>
* eldoc-eval.el: Fix redisplay of mode-line in emacs-24.4.
(eldoc-show-in-mode-line, eldoc-run-in-minibuffer): Do it.
---
eldoc-eval.el | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/eldoc-eval.el b/eldoc-eval.el
index 87ceeff497..3628bcb77f 100644
--- a/eldoc-eval.el
+++ b/eldoc-eval.el
@@ -150,10 +150,10 @@ See `with-eldoc-in-minibuffer'."
"Display string STR in the mode-line next to minibuffer."
(with-current-buffer (eldoc-current-buffer)
(let* ((max (window-width (selected-window)))
- (str (concat " " input))
+ (str (and (stringp input) (concat " " input)))
(len (length str))
(tmp-str str)
- (mode-line-format str)
+ (mode-line-format (or str mode-line-format))
roll mode-line-in-non-selected-windows)
(catch 'break
(if (and (> len max) eldoc-mode-line-rolling-flag)
@@ -222,7 +222,7 @@ See `with-eldoc-in-minibuffer'."
(doc (or (eldoc-get-var-docstring sym)
(eldoc-get-fnsym-args-string
(car info-fn) (cadr info-fn)))))
- (when doc (funcall eldoc-in-minibuffer-show-fn doc)))))
+ (funcall eldoc-in-minibuffer-show-fn (or doc 1)))))
(scan-error nil)
(beginning-of-buffer nil)
(error (message "Eldoc in minibuffer error: %S" err)))))
