diff options
| author | Andrea Corallo <akrl@sdf.org> | 2020-11-29 15:11:38 +0100 |
|---|---|---|
| committer | Andrea Corallo <akrl@sdf.org> | 2020-11-29 15:11:38 +0100 |
| commit | 6523b8401519a29ca0aefaf44c3dfa36f681f64e (patch) | |
| tree | a691422921ad1287fdeade2128efed4c59c14e8d /lisp/emacs-lisp/eldoc.el | |
| parent | 2e0256e0a02edad129e0af1ea97b9e263c5d83fb (diff) | |
| parent | 38ed05f49fcfe7c6d6908041010881a04a7ff6b1 (diff) | |
| download | emacs-6523b8401519a29ca0aefaf44c3dfa36f681f64e.tar.gz emacs-6523b8401519a29ca0aefaf44c3dfa36f681f64e.tar.bz2 emacs-6523b8401519a29ca0aefaf44c3dfa36f681f64e.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 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el index 78cb8f08c34..d81060ef165 100644 --- a/lisp/emacs-lisp/eldoc.el +++ b/lisp/emacs-lisp/eldoc.el @@ -591,7 +591,8 @@ Honor `eldoc-echo-area-use-multiline-p' and ;; format the *eldoc* buffer, using as most of its ;; contents as we know will fit. (with-current-buffer (eldoc--format-doc-buffer docs) - (eldoc--echo-area-substring available))) + (save-excursion + (eldoc--echo-area-substring available)))) (t ;; this is the "truncate brutally" situation (let ((string (with-current-buffer (eldoc--format-doc-buffer docs) |