From f2dd4ba86de585cb8b1ef505152b26c2ebc9d77e Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 14 Mar 2014 16:51:22 -0400 Subject: [PATCH] * lisp/info.el (Info-finder-find-node): Ignore the `emacs' metapackage. Fixes: debbugs:10813 --- lisp/ChangeLog | 3 +++ lisp/info.el | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index bc342f50331..a82495f3ac8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2014-03-14 Glenn Morris + * info.el (Info-finder-find-node): + Ignore the `emacs' metapackage. (Bug#10813) + * finder.el (finder-list-matches): Include unversioned packages in the result of a keyword search. diff --git a/lisp/info.el b/lisp/info.el index ee2d99f402e..2b2490b5bdc 100644 --- a/lisp/info.el +++ b/lisp/info.el @@ -3698,7 +3698,9 @@ Build a menu of the possible matches." hits desc) (dolist (keyword keywords) (push (copy-tree (gethash keyword finder-keywords-hash)) hits)) - (setq hits (delete-dups (apply 'append hits))) + (setq hits (delete-dups (apply 'append hits)) + ;; Not a meaningful package. + hits (delete 'emacs hits)) (dolist (package hits) (setq desc (cdr-safe (assq package package--builtins))) (when (vectorp desc) @@ -3713,6 +3715,9 @@ Build a menu of the possible matches." (insert "*****************\n\n") (insert "Commentary section of the package `" nodename "':\n\n") + ;; FIXME this assumes that a file named package.el exists, + ;; which is not always true. E.g. for the nxml package, + ;; there is no "nxml.el" (it's nxml-mode.el). (let ((str (lm-commentary (find-library-name nodename)))) (if (null str) (insert "Can't find any Commentary section\n\n") -- 2.39.2