[Emacs-diffs] emacs/lisp apropos.el

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       09/09/11 03:39:04

Modified files:
        lisp           : apropos.el 

Log message:
        (apropos-documentation-check-doc-file): Exclude unbound functions and
        variables, since they must be stuff specific to some other platform.
        (apropos-print): Make mouse-click message less specific about button.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/apropos.el?cvsroot=emacs&r1=1.141&r2=1.142

Patches:
Index: apropos.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/apropos.el,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -b -r1.141 -r1.142
--- apropos.el  31 Aug 2009 01:33:11 -0000      1.141
+++ apropos.el  11 Sep 2009 03:39:04 -0000      1.142
@@ -840,7 +840,14 @@
                         3)             ; variable documentation
                  symbol (read)
                  doc (buffer-substring (1+ (point)) (1- sepb)))
-           (when (apropos-true-hit-doc doc)
+           (when (and (apropos-true-hit-doc doc)
+                       ;; The DOC file lists all built-in funcs and vars.
+                       ;; If any are not currently bound, they can
+                       ;; only be platform-specific stuff (eg NS) not
+                       ;; in use on the current platform.
+                       ;; So we exclude them.
+                       (cond ((= 3 type) (boundp symbol))
+                             ((= 2 type) (fboundp symbol))))
              (or (and (setq apropos-item (assq symbol apropos-accumulator))
                       (setcar (cdr apropos-item)
                               (apropos-score-doc doc)))
@@ -976,8 +983,7 @@
            (insert
             "If moving the mouse over text changes the text's color, "
             "you can click\n"
-            "mouse-2 (second button from right) on that text to "
-            "get more information.\n"))
+            "or press return on that text to get more information.\n"))
        (insert "In this buffer, go to the name of the command, or function,"
                " or variable,\n"
                (substitute-command-keys