aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman1995-10-10 20:03:31 +0000
committerRichard M. Stallman1995-10-10 20:03:31 +0000
commitda16d59923508785ad12e1aca61e70af8bbf8cd7 (patch)
tree3ca84c3d474dda7639f9cb59cd7edc7e711d6810
parent6fdc249f09bb93de7201b4f0efc60192ee1914a5 (diff)
downloademacs-da16d59923508785ad12e1aca61e70af8bbf8cd7.tar.gz
emacs-da16d59923508785ad12e1aca61e70af8bbf8cd7.zip
(function-called-at-point, variable-at-point):
Don't back up if we start at the beginning of a symbol.
-rw-r--r--lisp/help.el8
1 files changed, 6 insertions, 2 deletions
diff --git a/lisp/help.el b/lisp/help.el
index f9a689bf081..48192073baf 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -445,7 +445,9 @@ C-w print information on absence of warranty for GNU Emacs."
445 (error nil)) 445 (error nil))
446 (condition-case () 446 (condition-case ()
447 (save-excursion 447 (save-excursion
448 (forward-sexp -1) 448 (and (or (eq (char-syntax (preceding-char)) ?_)
449 (eq (char-syntax (preceding-char)) ?w))
450 (forward-sexp -1))
449 (skip-chars-forward "'") 451 (skip-chars-forward "'")
450 (let ((obj (read (current-buffer)))) 452 (let ((obj (read (current-buffer))))
451 (and (symbolp obj) (fboundp obj) obj))) 453 (and (symbolp obj) (fboundp obj) obj)))
@@ -540,7 +542,9 @@ C-w print information on absence of warranty for GNU Emacs."
540(defun variable-at-point () 542(defun variable-at-point ()
541 (condition-case () 543 (condition-case ()
542 (save-excursion 544 (save-excursion
543 (forward-sexp -1) 545 (and (or (eq (char-syntax (preceding-char)) ?_)
546 (eq (char-syntax (preceding-char)) ?w))
547 (forward-sexp -1))
544 (skip-chars-forward "'") 548 (skip-chars-forward "'")
545 (let ((obj (read (current-buffer)))) 549 (let ((obj (read (current-buffer))))
546 (and (symbolp obj) (boundp obj) obj))) 550 (and (symbolp obj) (boundp obj) obj)))