diff options
author | Stefan Monnier <monnier@iro.umontreal.ca> | 2013-08-09 17:55:12 -0400 |
---|---|---|
committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2013-08-09 17:55:12 -0400 |
commit | dbb5d60608ae6b99910b0c374f82b63fde526abf (patch) | |
tree | ce8ff5fdb3cee0824975ad69e368df424baf0d35 | |
parent | 6a7e09e70b22a1789b288a0230fe5831ad9a366c (diff) | |
download | emacs-dbb5d60608ae6b99910b0c374f82b63fde526abf.tar.gz |
* packages/eldoc-eval/eldoc-eval.el (eldoc-mode-in-minibuffer): Operate on
current buffer rather than minibuffer-completion-contents.
-rw-r--r-- | packages/eldoc-eval/eldoc-eval.el | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/packages/eldoc-eval/eldoc-eval.el b/packages/eldoc-eval/eldoc-eval.el index b6c4f59b432..6d20da2413d 100644 --- a/packages/eldoc-eval/eldoc-eval.el +++ b/packages/eldoc-eval/eldoc-eval.el @@ -149,21 +149,15 @@ See `with-eldoc-in-minibuffer'." (defun eldoc-mode-in-minibuffer () "Show eldoc for current minibuffer input." - (let ((buf (with-selected-window (minibuffer-window) - (buffer-name)))) + (let ((buf (window-buffer (minibuffer-window)))) ;; If this minibuffer have been started with ;;`with-eldoc-in-minibuffer' give it eldoc support ;; and update mode-line, otherwise do nothing. (when (member buf eldoc-active-minibuffers-list) - (let* ((str-all (with-current-buffer buf - (minibuffer-completion-contents))) - (sym (when str-all - (with-temp-buffer - (insert str-all) - (goto-char (point-max)) - (unless (looking-back ")\\|\"") - (forward-char -1)) - (eldoc-current-symbol)))) + (let* ((sym (with-current-buffer buf + (unless (looking-back ")\\|\"") + (forward-char -1)) + (eldoc-current-symbol))) (info-fn (eldoc-fnsym-in-current-sexp)) (doc (or (eldoc-get-var-docstring sym) (eldoc-get-fnsym-args-string |