[Emacs-diffs] trunk r116764: * lisp/info.el (Info-finder-find-node): Ignore the `emacs' metapackage.

[Glenn Morris]

------------------------------------------------------------
revno: 116764
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/10813
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2014-03-14 16:51:22 -0400
message:
  * lisp/info.el (Info-finder-find-node): Ignore the `emacs' metapackage.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/info.el                   info.el-20091113204419-o5vbwnq5f7feedwu-261

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-03-14 20:41:01 +0000
+++ b/lisp/ChangeLog    2014-03-14 20:51:22 +0000
@@ -1,5 +1,8 @@
 2014-03-14  Glenn Morris  <address@hidden>
 
+       * 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.
 

=== modified file 'lisp/info.el'
--- a/lisp/info.el      2014-02-28 02:16:02 +0000
+++ b/lisp/info.el      2014-03-14 20:51:22 +0000
@@ -3698,7 +3698,9 @@
          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 @@
     (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")