(variable-at-point): Try `find-tag-default' when other methods failed.

1 files changed, 15 insertions, 12 deletions

diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index e534c6998a7..d193ad344f5 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -461,18 +461,21 @@ face (according to `face-differs-from-default-p')."
 (defun variable-at-point ()
   "Return the bound variable symbol found around point.
 Return 0 if there is no such symbol."
-  (condition-case ()
-      (with-syntax-table emacs-lisp-mode-syntax-table
-        (save-excursion
-          (or (not (zerop (skip-syntax-backward "_w")))
-              (eq (char-syntax (following-char)) ?w)
-              (eq (char-syntax (following-char)) ?_)
-              (forward-sexp -1))
-          (skip-chars-forward "'")
-          (let ((obj (read (current-buffer))))
-            (or (and (symbolp obj) (boundp obj) obj)
-                0))))
-    (error 0)))
+  (or (condition-case ()
+          (with-syntax-table emacs-lisp-mode-syntax-table
+            (save-excursion
+              (or (not (zerop (skip-syntax-backward "_w")))
+                  (eq (char-syntax (following-char)) ?w)
+                  (eq (char-syntax (following-char)) ?_)
+                  (forward-sexp -1))
+              (skip-chars-forward "'")
+              (let ((obj (read (current-buffer))))
+                (and (symbolp obj) (boundp obj) obj))))
+        (error nil))
+      (let* ((str (find-tag-default))
+             (obj (if str (read str))))
+        (and (symbolp obj) (boundp obj) obj))
+      0))
 
 ;;;###autoload
 (defun describe-variable (variable &optional buffer)