(help-xref-on-pp): Check for constant symbols.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8b8bb650ef22e6c73a89b7ac9bc509cb8d715cd3..9433f96464544fb35ff2c01ec98ef30bd1e71f8f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2000-05-02  Dave Love  <fx@gnu.org>
+
+       * help.el (help-xref-on-pp): Check for constant symbols.
+
 2000-04-29  Gerd Moellmann  <gerd@gnu.org>
 
        * startup.el (normal-top-level): Put a condition-case around

diff --git a/lisp/help.el b/lisp/help.el
index 6e343c03ce6c3729a8ead88e6334f3f9182c19a4..6b4b65ef6da0c593de14ce2ca03bcf001a4a4045 100644 (file)
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -766,9 +766,14 @@ Return 0 if there is no such symbol."
               ((looking-at "#<") (search-forward ">" nil 'move))
               ((looking-at "\\(\\(\\sw\\|\\s_\\)+\\)")
                (let* ((sym (intern-soft
-                            (buffer-substring (match-beginning 1) (match-end 1))))
+                            (buffer-substring (match-beginning 1)
+                                              (match-end 1))))
                       (fn (cond ((fboundp sym) #'describe-function)
-                                ((and sym (boundp sym)) #'describe-variable))))
+                                ((or (memq sym '(t nil))
+                                     (keywordp sym))
+                                 nil)
+                                ((and sym (boundp sym))
+                                 #'describe-variable))))
                  (when fn (help-xref-button 1 fn sym)))
                (goto-char (match-end 1)))
               (t (forward-char 1))))))
@@ -782,7 +787,8 @@ Returns the documentation as a string, also."
         (enable-recursive-minibuffers t)
         val)
      (setq val (completing-read (if (symbolp v)
-                                   (format "Describe variable (default %s): " v)
+                                   (format
+                                    "Describe variable (default %s): " v)
                                  "Describe variable: ")
                                obarray 'boundp t nil nil
                                (if (symbolp v) (symbol-name v))))