diff options
| author | Glenn Morris | 2014-03-14 16:51:22 -0400 |
|---|---|---|
| committer | Glenn Morris | 2014-03-14 16:51:22 -0400 |
| commit | f2dd4ba86de585cb8b1ef505152b26c2ebc9d77e (patch) | |
| tree | 92afdfe4ddab6a2837e9d53d5359ec67e5631938 | |
| parent | ac0f82ef86b56c7f3bdaba1fef86162c56ee0467 (diff) | |
| download | emacs-f2dd4ba86de585cb8b1ef505152b26c2ebc9d77e.tar.gz emacs-f2dd4ba86de585cb8b1ef505152b26c2ebc9d77e.zip | |
* lisp/info.el (Info-finder-find-node): Ignore the `emacs' metapackage.
Fixes: debbugs:10813
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/info.el | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index bc342f50331..a82495f3ac8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2014-03-14 Glenn Morris <rgm@gnu.org> | 1 | 2014-03-14 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * info.el (Info-finder-find-node): | ||
| 4 | Ignore the `emacs' metapackage. (Bug#10813) | ||
| 5 | |||
| 3 | * finder.el (finder-list-matches): Include unversioned packages | 6 | * finder.el (finder-list-matches): Include unversioned packages |
| 4 | in the result of a keyword search. | 7 | in the result of a keyword search. |
| 5 | 8 | ||
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." | |||
| 3698 | hits desc) | 3698 | hits desc) |
| 3699 | (dolist (keyword keywords) | 3699 | (dolist (keyword keywords) |
| 3700 | (push (copy-tree (gethash keyword finder-keywords-hash)) hits)) | 3700 | (push (copy-tree (gethash keyword finder-keywords-hash)) hits)) |
| 3701 | (setq hits (delete-dups (apply 'append hits))) | 3701 | (setq hits (delete-dups (apply 'append hits)) |
| 3702 | ;; Not a meaningful package. | ||
| 3703 | hits (delete 'emacs hits)) | ||
| 3702 | (dolist (package hits) | 3704 | (dolist (package hits) |
| 3703 | (setq desc (cdr-safe (assq package package--builtins))) | 3705 | (setq desc (cdr-safe (assq package package--builtins))) |
| 3704 | (when (vectorp desc) | 3706 | (when (vectorp desc) |
| @@ -3713,6 +3715,9 @@ Build a menu of the possible matches." | |||
| 3713 | (insert "*****************\n\n") | 3715 | (insert "*****************\n\n") |
| 3714 | (insert | 3716 | (insert |
| 3715 | "Commentary section of the package `" nodename "':\n\n") | 3717 | "Commentary section of the package `" nodename "':\n\n") |
| 3718 | ;; FIXME this assumes that a file named package.el exists, | ||
| 3719 | ;; which is not always true. E.g. for the nxml package, | ||
| 3720 | ;; there is no "nxml.el" (it's nxml-mode.el). | ||
| 3716 | (let ((str (lm-commentary (find-library-name nodename)))) | 3721 | (let ((str (lm-commentary (find-library-name nodename)))) |
| 3717 | (if (null str) | 3722 | (if (null str) |
| 3718 | (insert "Can't find any Commentary section\n\n") | 3723 | (insert "Can't find any Commentary section\n\n") |