* info.el (Info-menu): Handle string value of FORK arg.

Fixes: debbugs:10858

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1bde1a36d544361ca08858bcaaefbbadc6f6523b..db860979577e815858c6f29f4cc8250dfbcf1426 100644 (file)
--- 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 b7e2d1eedbe82ff53d90d1f7fed36b7829b4a521..042ff1583620fb149824d5bd3b587a17d8ef849e 100644 (file)
--- 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))