(calculator-last-input): Guard uses of event-key and key-press-event-p.

[gnu-emacs] / lisp / help-fns.el

diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index 57b0b39767e244daccdf794d81328ac1d0733069..93c34af7a5cc2199110963a70772f8d96326008f 100644 (file)
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -97,6 +97,7 @@ With ARG, you are asked to choose which language."
          (forward-line 1)
          (newline (- n (/ n 2)))))
       (goto-char (point-min))
+      (setq buffer-undo-list nil)
       (set-buffer-modified-p nil))))
 
 ;;;###autoload
@@ -216,6 +217,14 @@ ARGLIST can also be t or a string of the form \"(FUN ARG1 ARG2 ...)\"."
                        (intern (upcase name))))))
                arglist)))
 
+;; Could be this, if we make symbol-file do the work below.
+;; (defun help-C-file-name (subr-or-var kind)
+;;   "Return the name of the C file where SUBR-OR-VAR is defined.
+;; KIND should be `var' for a variable or `subr' for a subroutine."
+;;   (symbol-file (if (symbolp subr-or-var) subr-or-var
+;;              (subr-name subr-or-var))
+;;            (if (eq kind 'var) 'defvar 'defun)))
+;;;###autoload
 (defun help-C-file-name (subr-or-var kind)
   "Return the name of the C file where SUBR-OR-VAR is defined.
 KIND should be `var' for a variable or `subr' for a subroutine."
@@ -228,9 +237,14 @@ KIND should be `var' for a variable or `subr' for a subroutine."
       (if (eobp)
          (insert-file-contents-literally
           (expand-file-name internal-doc-file-name doc-directory)))
-      (search-forward (concat "\1f" name "\n"))
-      (re-search-backward "\1fS\\(.*\\)")
-      (let ((file (match-string 1)))
+      (let ((file (catch 'loop
+                   (while t
+                     (let ((pnt (search-forward (concat "\1f" name "\n"))))
+                       (re-search-backward "\1fS\\(.*\\)")
+                       (let ((file (match-string 1)))
+                         (if (member file build-files)
+                             (throw 'loop file)
+                           (goto-char pnt))))))))
        (if (string-match "\\.\\(o\\|obj\\)\\'" file)
            (setq file (replace-match ".c" t t file)))
        (if (string-match "\\.c\\'" file)
@@ -261,9 +275,9 @@ face (according to `face-differs-from-default-p')."
                    ;; This is heuristic, but covers all common cases
                    ;; except ARG1-ARG2
                    (concat "\\<"                   ; beginning of word
-                           "\\(?:[a-z-]+-\\)?"     ; for xxx-ARG
+                           "\\(?:[a-z-]*-\\)?"     ; for xxx-ARG
                            "\\("
-                           arg
+                           (regexp-quote arg)
                            "\\)"
                            "\\(?:es\\|s\\|th\\)?"  ; for ARGth, ARGs
                            "\\(?:-[a-z-]+\\)?"     ; for ARG-xxx
@@ -350,7 +364,7 @@ face (according to `face-differs-from-default-p')."
          (if (re-search-backward "alias for `\\([^`']+\\)'" nil t)
              (help-xref-button 1 'help-function def)))))
     (or file-name
-       (setq file-name (symbol-file function)))
+       (setq file-name (symbol-file function 'defun)))
     (when (equal file-name "loaddefs.el")
       ;; Find the real def site of the preloaded function.
       ;; This is necessary only for defaliases.
@@ -458,9 +472,10 @@ face (according to `face-differs-from-default-p')."
 ;; Variables
 
 ;;;###autoload
-(defun variable-at-point ()
+(defun variable-at-point (&optional any-symbol)
   "Return the bound variable symbol found around point.
-Return 0 if there is no such symbol."
+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
@@ -473,8 +488,13 @@ Return 0 if there is no such symbol."
                (and (symbolp obj) (boundp obj) obj))))
        (error nil))
       (let* ((str (find-tag-default))
-            (obj (if str (read str))))
-       (and (symbolp obj) (boundp obj) obj))
+            (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
@@ -515,7 +535,9 @@ it is displayed along with the global value."
                (terpri)
                (let ((from (point)))
                  (pp val)
-                 (help-xref-on-pp from (point))
+                 ;; Hyperlinks in variable's value are quite frequently
+                 ;; inappropriate e.g C-h v <RET> features <RET>
+                 ;; (help-xref-on-pp from (point))
                  (if (< (point) (+ from 20))
                      (delete-region (1- from) from)))))
            (terpri)
@@ -536,7 +558,8 @@ it is displayed along with the global value."
                    ;; sensible size before prettyprinting.  -- fx
                    (let ((from (point)))
                      (pp val)
-                     (help-xref-on-pp from (point))
+                     ;; See previous comment for this function.
+                     ;; (help-xref-on-pp from (point))
                      (if (< (point) (+ from 20))
                        (delete-region (1- from) from))))))
              (terpri))
@@ -559,6 +582,7 @@ it is displayed along with the global value."
                  (insert " value is shown ")
                  (insert-button "below"
                                 'action help-button-cache
+                                'follow-link t
                                 'help-echo "mouse-2, RET: show value")
                  (insert ".\n\n")))
              ;; Add a note for variables that have been make-var-buffer-local.
@@ -603,7 +627,7 @@ it is displayed along with the global value."
            ;; Make a hyperlink to the library if appropriate.  (Don't
            ;; change the format of the buffer's initial line in case
            ;; anything expects the current format.)
-           (let ((file-name (symbol-file (cons 'defvar variable))))
+           (let ((file-name (symbol-file variable 'defvar)))
              (when (equal file-name "loaddefs.el")
                ;; Find the real def site of the preloaded variable.
                (let ((location
@@ -691,5 +715,5 @@ BUFFER should be a buffer or a buffer name."
 
 (provide 'help-fns)
 
-;;; arch-tag: 9e10331c-ae81-4d13-965d-c4819aaab0b3
+;; arch-tag: 9e10331c-ae81-4d13-965d-c4819aaab0b3
 ;;; help-fns.el ends here