(Info-additional-directory-list): New variable.

(Info-find-node): Use it.

diff --git a/lisp/info.el b/lisp/info.el
index bba7806a9f0af90b7b29517532130df704750770..7464e22c76535e53a7235adb708157b7be5a77b1 100644 (file)
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -52,6 +52,7 @@ in paths.el.")
 
 (defvar Info-fontify-maximum-menu-size 30000
   "*Maximum size of menu to fontify if `Info-fontify' is non-nil.")
+
 (defvar Info-directory-list
   (let ((path (getenv "INFOPATH"))
        (sep (if (eq system-type 'ms-dos) ";" ":"))
@@ -90,6 +91,10 @@ source tree, the `info' directory in the source tree is used as the last
 element, in place of the installation Info directory.  This is useful
 when you run a version of Emacs without installing it.")
 
+(defvar Info-additional-directory-list nil
+  "List of additional directories to search for Info documentation files.
+These directories are not searched for merging the `dir' file.")
+
 (defvar Info-current-file nil
   "Info file that Info is now looking at, or nil.")
 
@@ -210,7 +215,10 @@ In standalone mode, \\<Info-mode-map>\\[Info-exit] exits Emacs itself."
                          ;; If specified name starts with `./'
                          ;; then just try current directory.
                          '("./")
-                       Info-directory-list)))
+                       (if Info-additional-directory-list
+                           (append Info-directory-list
+                                   Info-additional-directory-list)
+                         Info-directory-list))))
            ;; Search the directory list for file FILENAME.
            (while (and dirs (not found))
              (setq temp (expand-file-name filename (car dirs)))