# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 813520577 0
# Node ID 69ab0ac9501a466066087debc7a311035aacc6dd
# Parent  95fbb5bd0a5a49e31ba157568c492b18c2e5f53f
(variable-at-point, function-called-at-point): Fix revious changes.

diff -r 95fbb5bd0a5a -r 69ab0ac9501a lisp/help.el
--- a/lisp/help.el	Thu Oct 12 15:44:45 1995 +0000
+++ b/lisp/help.el	Thu Oct 12 17:56:17 1995 +0000
@@ -445,9 +445,10 @@
 	(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 @@
 (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)))