Merge from emacs-23

[gnu-emacs] / lisp / help.el

diff --git a/lisp/help.el b/lisp/help.el
index 97690ea6b85ab877e78c69068349d9b551c41d3e..f7a8ca1634e5162ff6be9d36c4ac3bd632851214 100644 (file)
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -5,6 +5,7 @@
 
 ;; Maintainer: FSF
 ;; Keywords: help, internal
+;; Package: emacs
 
 ;; This file is part of GNU Emacs.
 
@@ -103,6 +104,7 @@
     (define-key map "m" 'describe-mode)
     (define-key map "n" 'view-emacs-news)
     (define-key map "p" 'finder-by-keyword)
+    (define-key map "P" 'describe-package)
     (define-key map "r" 'info-emacs-manual)
     (define-key map "s" 'describe-syntax)
     (define-key map "t" 'help-with-tutorial)
@@ -117,9 +119,6 @@
 (define-key global-map [f1] 'help-command)
 (fset 'help-command help-map)
 
-(autoload 'finder-by-keyword "finder"
-  "Find packages matching a given keyword." t)
-
 ;; insert-button makes the action nil if it is not store somewhere
 (defvar help-button-cache nil)
 
@@ -873,7 +872,9 @@ whose documentation describes the minor mode."
               (insert (format-mode-line mode nil nil buffer))
               (add-text-properties start (point) '(face bold)))))
        (princ " mode:\n")
-       (princ (documentation major-mode))))))
+       (princ (documentation major-mode)))))
+  ;; For the sake of IELM and maybe others
+  nil)
 
 
 (defun describe-minor-mode (minor-mode)
@@ -1248,5 +1249,4 @@ Select help window if the actual value of the user option
 \f
 (provide 'help)
 
-;; arch-tag: cf427352-27e9-49b7-9a6f-741ebab02423
 ;;; help.el ends here