(info): Don't add parens if FILE already has them.

diff --git a/lisp/info.el b/lisp/info.el
index c96844a88fc69735f1478482614eba5b7561203e..6149c570b148dc137ac21e246ae97efe2ef743d8 100644 (file)
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -299,8 +299,15 @@ in all the directories in that path."
   (interactive (if current-prefix-arg
                   (list (read-file-name "Info file name: " nil nil t))))
   (if file
-      (progn (pop-to-buffer "*info*")
-            (Info-goto-node (concat "(" file ")")))
+      (progn
+       (pop-to-buffer "*info*")
+       ;; If argument already contains parentheses, don't add another set
+       ;; since the argument will then be parsed improperly.  This also
+       ;; has the added benefit of allowing node names to be included
+       ;; following the parenthesized filename.
+       (if (and (stringp file) (string-match "(.*)" file))
+           (Info-goto-node file)
+         (Info-goto-node (concat "(" file ")"))))
     (if (get-buffer "*info*")
        (pop-to-buffer "*info*")
       (Info-directory))))