(function-called-at-point, variable-at-point):

Don't back up if we start at the beginning of a symbol.

diff --git a/lisp/help.el b/lisp/help.el
index f9a689bf081b18cb06dad21e5dd98376b230ec23..48192073baf33c7891c4e88ae2cfd4fd94e35c04 100644 (file)
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -445,7 +445,9 @@ C-w print information on absence of warranty for GNU Emacs."
        (error nil))
       (condition-case ()
          (save-excursion
-           (forward-sexp -1)
+           (and (or (eq (char-syntax (preceding-char)) ?_)
+                    (eq (char-syntax (preceding-char)) ?w))
+                (forward-sexp -1))
            (skip-chars-forward "'")
            (let ((obj (read (current-buffer))))
              (and (symbolp obj) (fboundp obj) obj)))
@@ -540,7 +542,9 @@ C-w print information on absence of warranty for GNU Emacs."
 (defun variable-at-point ()
   (condition-case ()
       (save-excursion
-       (forward-sexp -1)
+       (and (or (eq (char-syntax (preceding-char)) ?_)
+                (eq (char-syntax (preceding-char)) ?w))
+            (forward-sexp -1))
        (skip-chars-forward "'")
        (let ((obj (read (current-buffer))))
          (and (symbolp obj) (boundp obj) obj)))