Changeset 3988 for vendor/emacs-CVS_HEAD/lisp/help-mode.el

Timestamp:

11/26/05 08:33:26 (3 years ago)

Author:

miyoshi

Message:

Sync up with Emacs CVS HEAD.

Files:

• vendor/emacs-CVS_HEAD/lisp/help-mode.el (modified) (5 diffs)

vendor/emacs-CVS_HEAD/lisp/help-mode.el

@@ -385 +385 @@
-                        (cond
-                         ((match-string 3)  ; `variable' &c
-
+or (
-                                        ; it's actually bound
+                                   (get sym 'variable-documentation))
-                               (help-xref-button 8 'help-variable sym)))
-                         ((match-string 4)   ; `function' &c
@@ -407 +408 @@
-                           (save-match-data (looking-at "[ \t\n]+face\\W")))
-                          (help-xref-button 8 'help-face sym))
-
+
+
+
-                          ;; We can't intuit whether to use the
-                          ;; variable or function doc -- supply both.
-                          (help-xref-button 8 'help-symbol sym))
-                         ((and
-
+
+
-                           (or
-                            (documentation-property
@@ -519 +523 @@
-                                          (keywordp sym))
-                                      nil)
-
+
+
+
+
-                                      'help-variable))))
-                    (when type (help-xref-button 1 type sym)))
@@ -543 +550 @@
-                  (setq help-xref-stack-item nil)
-                  (describe-function symbol)))
-
+
+
-                  ;; Don't record the current entry in the stack.
-                  (setq help-xref-stack-item nil)
@@ -640 +648 @@
-                                (progn (skip-syntax-forward "w_")
-                                       (point)))))))
-
+
+
+
-        (help-do-xref pos #'help-xref-interned (list sym))))))
-