[Emacs-diffs] Changes to emacs/lisp/help-fns.el

[Richard M . Stallman]

Index: emacs/lisp/help-fns.el
diff -c emacs/lisp/help-fns.el:1.61 emacs/lisp/help-fns.el:1.62
*** emacs/lisp/help-fns.el:1.61 Mon Dec 27 16:24:20 2004
--- emacs/lisp/help-fns.el      Wed Jan  5 01:09:23 2005
***************
*** 463,471 ****
  ;; Variables
  
  ;;;###autoload
! (defun variable-at-point ()
    "Return the bound variable symbol found around point.
! Return 0 if there is no such symbol."
    (or (condition-case ()
          (with-syntax-table emacs-lisp-mode-syntax-table
            (save-excursion
--- 463,472 ----
  ;; Variables
  
  ;;;###autoload
! (defun variable-at-point (&optional any-symbol)
    "Return the bound variable symbol found around point.
! Return 0 if there is no such symbol.
! If ANY-SYMBOL is non-nil, don't insist the symbol be bound."
    (or (condition-case ()
          (with-syntax-table emacs-lisp-mode-syntax-table
            (save-excursion
***************
*** 479,490 ****
        (error nil))
        (let* ((str (find-tag-default))
             (sym (if str (intern-soft str))))
!       (if (and sym (boundp sym))
            sym
          (save-match-data
            (when (and str (string-match "\\`\\W*\\(.*?\\)\\W*\\'" str))
              (setq sym (intern-soft (match-string 1 str)))
!             (and (boundp sym) sym)))))
        0))
  
  ;;;###autoload
--- 480,491 ----
        (error nil))
        (let* ((str (find-tag-default))
             (sym (if str (intern-soft str))))
!       (if (and sym (or any-symbol (boundp sym)))
            sym
          (save-match-data
            (when (and str (string-match "\\`\\W*\\(.*?\\)\\W*\\'" str))
              (setq sym (intern-soft (match-string 1 str)))
!             (and (or any-symbol (boundp sym)) sym)))))
        0))
  
  ;;;###autoload