summaryrefslogtreecommitdiff
path: root/lisp/info.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/info.el')
-rw-r--r--lisp/info.el7
1 files changed, 7 insertions, 0 deletions
diff --git a/lisp/info.el b/lisp/info.el
index 84fc13ccc7d..b8e30fadef3 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -732,6 +732,13 @@ in `Info-file-supports-index-cookies-list'."
(Info-default-dirs))
(split-string path sep))
(Info-default-dirs))))
+ ;; If we are running uninstalled, our own Info files should
+ ;; always come first. If INFOPATH was set, they might not.
+ (and path
+ installation-directory
+ (let ((dir (expand-file-name "info/" installation-directory)))
+ (setq Info-directory-list (delete dir Info-directory-list))
+ (push dir Info-directory-list)))
;; For a self-contained (ie relocatable) NS build, AFAICS we
;; always want the included info directory to be at the head of
;; the search path, unless it's already in INFOPATH somewhere.