* lisp/info.el (Info-finder-find-node): Ignore the `emacs' metapackage.

Fixes: debbugs:10813

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bc342f50331c49574d8157437c8345db7ae2a23c..a82495f3ac8b483811051bd41fa89202a9aafa6e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2014-03-14  Glenn Morris  <rgm@gnu.org>
 
+       * 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 ee2d99f402ec0084a9e9a2462d0e8cf3775d3155..2b2490b5bdc11eebdff820073b22a7cb24293bf8 100644 (file)
--- 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")