Merge from trunk

[gnu-emacs] / lisp / help.el

diff --git a/lisp/help.el b/lisp/help.el
index 1cba4088a19481834288604a98917f73a469df11..9fcb06c559f3d1fcd429f6db82be66e2a9e5dc73 100644 (file)
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -1,10 +1,11 @@
 ;;; help.el --- help commands for Emacs
 
-;; Copyright (C) 1985, 1986, 1993, 1994, 1998, 1999, 2000, 2001, 2002,
-;;   2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1985-1986, 1993-1994, 1998-2011
+;;   Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: help, internal
+;; Package: emacs
 
 ;; This file is part of GNU Emacs.
 
@@ -118,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)
 
@@ -1251,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