branch: externals/eldoc-eval
commit deca5e39f31282a06531002d289258cd099433c0
Author: Thierry Volpiatto <[email protected]>
Commit: Thierry Volpiatto <[email protected]>
Fix eldoc compat with emacs-25.
* eldoc-eval.el (eldoc-run-in-minibuffer): Fix looking-back for emacs-25.
---
eldoc-eval.el | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/eldoc-eval.el b/eldoc-eval.el
index eb7d5799a9..ec23f4b6d8 100644
--- a/eldoc-eval.el
+++ b/eldoc-eval.el
@@ -54,8 +54,8 @@
(when (require 'elisp-mode nil t) ; emacs-25
(defalias 'eldoc-current-symbol 'elisp--current-symbol)
(defalias 'eldoc-fnsym-in-current-sexp 'elisp--fnsym-in-current-sexp)
- (defalias 'eldoc-get-fnsym-args-string 'elisp--get-fnsym-args-string)
- (defalias 'eldoc-get-var-docstring 'elisp--get-var-docstring))
+ (defalias 'eldoc-get-fnsym-args-string 'elisp-get-fnsym-args-string)
+ (defalias 'eldoc-get-var-docstring 'elisp-get-var-docstring))
;;; Minibuffer support.
;; Enable displaying eldoc info in something else
@@ -221,7 +221,7 @@ See `with-eldoc-in-minibuffer'."
(when (member buf eldoc-active-minibuffers-list)
(with-current-buffer buf
(let* ((sym (save-excursion
- (unless (looking-back ")\\|\"")
+ (unless (looking-back ")\\|\"" (1- (point)))
(forward-char -1))
(eldoc-current-symbol)))
(info-fn (eldoc-fnsym-in-current-sexp))
