(variable-at-point, function-called-at-point): Fix revious changes.

diff --git a/lisp/help.el b/lisp/help.el
index 48192073baf33c7891c4e88ae2cfd4fd94e35c04..bcd646c12813e6af6fbfdef86ed861ac9c6107c8 100644 (file)
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -445,9 +445,10 @@ C-w print information on absence of warranty for GNU Emacs."
        (error nil))
       (condition-case ()
          (save-excursion
-           (and (or (eq (char-syntax (preceding-char)) ?_)
-                    (eq (char-syntax (preceding-char)) ?w))
-                (forward-sexp -1))
+           (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) (fboundp obj) obj)))
@@ -542,9 +543,10 @@ C-w print information on absence of warranty for GNU Emacs."
 (defun variable-at-point ()
   (condition-case ()
       (save-excursion
-       (and (or (eq (char-syntax (preceding-char)) ?_)
-                (eq (char-syntax (preceding-char)) ?w))
-            (forward-sexp -1))
+       (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)))