aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/info.el10
1 files changed, 9 insertions, 1 deletions
diff --git a/lisp/info.el b/lisp/info.el
index bba7806a9f0..7464e22c765 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -52,6 +52,7 @@ in paths.el.")
52 52
53(defvar Info-fontify-maximum-menu-size 30000 53(defvar Info-fontify-maximum-menu-size 30000
54 "*Maximum size of menu to fontify if `Info-fontify' is non-nil.") 54 "*Maximum size of menu to fontify if `Info-fontify' is non-nil.")
55
55(defvar Info-directory-list 56(defvar Info-directory-list
56 (let ((path (getenv "INFOPATH")) 57 (let ((path (getenv "INFOPATH"))
57 (sep (if (eq system-type 'ms-dos) ";" ":")) 58 (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
90element, in place of the installation Info directory. This is useful 91element, in place of the installation Info directory. This is useful
91when you run a version of Emacs without installing it.") 92when you run a version of Emacs without installing it.")
92 93
94(defvar Info-additional-directory-list nil
95 "List of additional directories to search for Info documentation files.
96These directories are not searched for merging the `dir' file.")
97
93(defvar Info-current-file nil 98(defvar Info-current-file nil
94 "Info file that Info is now looking at, or nil.") 99 "Info file that Info is now looking at, or nil.")
95 100
@@ -210,7 +215,10 @@ In standalone mode, \\<Info-mode-map>\\[Info-exit] exits Emacs itself."
210 ;; If specified name starts with `./' 215 ;; If specified name starts with `./'
211 ;; then just try current directory. 216 ;; then just try current directory.
212 '("./") 217 '("./")
213 Info-directory-list))) 218 (if Info-additional-directory-list
219 (append Info-directory-list
220 Info-additional-directory-list)
221 Info-directory-list))))
214 ;; Search the directory list for file FILENAME. 222 ;; Search the directory list for file FILENAME.
215 (while (and dirs (not found)) 223 (while (and dirs (not found))
216 (setq temp (expand-file-name filename (car dirs))) 224 (setq temp (expand-file-name filename (car dirs)))