summaryrefslogtreecommitdiff
path: root/helm-eval.el
diff options
context:
space:
mode:
authorThierry Volpiatto <thierry.volpiatto@gmail.com>2013-04-21 08:01:57 +0200
committerThierry Volpiatto <thierry.volpiatto@gmail.com>2013-04-21 08:01:57 +0200
commit9b3b7b49bfe2a721cf80b7f5c46d5ef649046af1 (patch)
tree860f1cf48f9bbedcac0e7956a659f681ecaeee85 /helm-eval.el
parent84181664df10c3672fce393c4143afdb20bf8b5a (diff)
* helm-eval.el (helm-eldoc-show-in-eval): Get rid of `minibuffer-completion-contents'.
Diffstat (limited to 'helm-eval.el')
-rw-r--r--helm-eval.el23
1 files changed, 10 insertions, 13 deletions
diff --git a/helm-eval.el b/helm-eval.el
index 75d4026a..f95ea5cf 100644
--- a/helm-eval.el
+++ b/helm-eval.el
@@ -100,19 +100,16 @@ Should take one arg: the string to display."
(buffer-name))))
(condition-case err
(when (member buf helm-eldoc-active-minibuffers-list)
- (let* ((str-all (with-current-buffer buf
- (helm-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))))
- (info-fn (eldoc-fnsym-in-current-sexp))
- (doc (or (eldoc-get-var-docstring sym)
- (eldoc-get-fnsym-args-string
- (car info-fn) (cadr info-fn)))))
- (when doc (funcall helm-eldoc-in-minibuffer-show-fn doc))))
+ (with-current-buffer buf
+ (let* ((sym (save-excursion
+ (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
+ (car info-fn) (cadr info-fn)))))
+ (when doc (funcall helm-eldoc-in-minibuffer-show-fn doc)))))
(scan-error nil)
(beginning-of-buffer nil)
(error (message "Eldoc in minibuffer error: %S" err)))))