diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2019-05-01 12:37:48 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2019-05-01 12:37:48 -0400 |
| commit | 5bd25c095eb7f7d148b47e6823c7eccd6416a693 (patch) | |
| tree | 3f4902d3369da65ccafdf4c0ae6182c0f1673811 | |
| parent | 5a4f58f7eef542a61663360866f69f477472090c (diff) | |
| download | emacs-5bd25c095eb7f7d148b47e6823c7eccd6416a693.tar.gz | |
* lisp/help.el (function-called-at-point): Use Elisp's forward-sexp-function
| -rw-r--r-- | lisp/help.el | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/lisp/help.el b/lisp/help.el index d1f473517d5..4dfe471c106 100644 --- a/lisp/help.el +++ b/lisp/help.el @@ -265,17 +265,19 @@ If that doesn't give a function, return nil." (condition-case () (save-excursion (save-restriction - (narrow-to-region (max (point-min) - (- (point) 1000)) (point-max)) - ;; Move up to surrounding paren, then after the open. - (backward-up-list 1) - (forward-char 1) - ;; If there is space here, this is probably something - ;; other than a real Lisp function call, so ignore it. - (if (looking-at "[ \t]") - (error "Probably not a Lisp function call")) - (let ((obj (read (current-buffer)))) - (and (symbolp obj) (fboundp obj) obj)))) + (let ((forward-sexp-function nil)) ;Use elisp-mode's value + (narrow-to-region (max (point-min) + (- (point) 1000)) + (point-max)) + ;; Move up to surrounding paren, then after the open. + (backward-up-list 1) + (forward-char 1) + ;; If there is space here, this is probably something + ;; other than a real Lisp function call, so ignore it. + (if (looking-at "[ \t]") + (error "Probably not a Lisp function call")) + (let ((obj (read (current-buffer)))) + (and (symbolp obj) (fboundp obj) obj))))) (error nil)) (let* ((str (find-tag-default)) (sym (if str (intern-soft str)))) |