* term/rxvt.el (rxvt-register-default-colors): Add support for 88

[gnu-emacs] / lisp / apropos.el

diff --git a/lisp/apropos.el b/lisp/apropos.el
index ae8a4ad628cb35b93c6bfad84f7e52574e5da794..990ad68e5ec4649ad11116c9afd12dd9a66e0805 100644 (file)
--- a/lisp/apropos.el
+++ b/lisp/apropos.el
@@ -1,6 +1,7 @@
 ;;; apropos.el --- apropos commands for users and programmers
 
-;; Copyright (C) 1989,94,1995,2001,02,03,04,2005  Free Software Foundation, Inc.
+;; Copyright (C) 1989, 1994, 1995, 2001, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Joe Wells <jbw@bigbird.bu.edu>
 ;; Rewritten: Daniel Pfeiffer <occitan@esperanto.org>
@@ -20,8 +21,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:
 
@@ -61,7 +62,7 @@
 (eval-when-compile (require 'cl))
 
 (defgroup apropos nil
-  "Apropos commands for users and programmers"
+  "Apropos commands for users and programmers."
   :group 'help
   :prefix "apropos")
 
@@ -442,7 +443,7 @@ satisfy the predicate VAR-PREDICATE."
        (setq p (cdr p))))
     (and (apropos-print t nil)
         message
-        (message message))))
+        (message "%s" message))))
 
 
 ;;;###autoload
@@ -860,13 +861,12 @@ If non-nil TEXT is a string that will be printed as a heading."
                                              key))
                       key)
                     item ", "))
-                (insert "M-x")
-                (put-text-property (- (point) 3) (point)
-                                   'face apropos-keybinding-face)
-                (insert " " (symbol-name symbol) " ")
-                (insert "RET")
-                (put-text-property (- (point) 3) (point)
-                                   'face apropos-keybinding-face)))
+                (insert "M-x ... RET")
+                (when apropos-keybinding-face
+                  (put-text-property (- (point) 11) (- (point) 8)
+                                     'face apropos-keybinding-face)
+                  (put-text-property (- (point) 3) (point)
+                                     'face apropos-keybinding-face))))
          (terpri)
          (apropos-print-doc 2
                             (if (commandp symbol)