diff options
author | Chong Yidong <cyd@gnu.org> | 2012-03-22 00:56:55 +0800 |
---|---|---|
committer | Chong Yidong <cyd@gnu.org> | 2012-03-22 00:56:55 +0800 |
commit | 69188b79dfc4b933f818d536783b6911140961b7 (patch) | |
tree | 2722b7d5ee8fde14ae60ddfd85fbc4dccd4c99cc | |
parent | 99fc91fecd99f7b298d1c812cecf9743b3f41b00 (diff) | |
download | emacs-69188b79dfc4b933f818d536783b6911140961b7.tar.gz |
* info.el (Info-menu): Handle string value of FORK arg.
Fixes: debbugs:10858
-rw-r--r-- | lisp/ChangeLog | 4 | ||||
-rw-r--r-- | lisp/info.el | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1bde1a36d54..db860979577 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2012-03-21 Drew Adams <drew.adams@oracle.com> + + * info.el (Info-menu): Handle string value of FORK arg (Bug#10858). + 2012-03-21 Anmol Khirbat <anmol@khirbat.net> (tiny change) * ido.el (ido-set-current-directory, ido-read-internal) diff --git a/lisp/info.el b/lisp/info.el index b7e2d1eedbe..042ff158362 100644 --- a/lisp/info.el +++ b/lisp/info.el @@ -2594,7 +2594,9 @@ new buffer." (list item current-prefix-arg)))) ;; there is a problem here in that if several menu items have the same ;; name you can only go to the node of the first with this command. - (Info-goto-node (Info-extract-menu-item menu-item) (if fork menu-item))) + (Info-goto-node (Info-extract-menu-item menu-item) + (and fork + (if (stringp fork) fork menu-item)))) (defun Info-extract-menu-item (menu-item) (setq menu-item (regexp-quote menu-item)) |