If running uninstalled, always put our own info files first

* lisp/info.el (info-initialize): If running uninstalled, ensure our
own info files are always found first, even if INFOPATH is set.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0c1b111e3b09616c3f0d5d14211699dea356fecc..7fecb6b58c379fc3c51e9bba08a6fb547b9602d7 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2014-01-10  Glenn Morris  <rgm@gnu.org>
 
+       * info.el (info-initialize): If running uninstalled, ensure our
+       own info files are always found first, even if INFOPATH is set.
+
        * help.el (view-order-manuals): Open emacs.info rather than ORDERS.
 
 2014-01-09  David Engster  <deng@randomsample.de>

diff --git a/lisp/info.el b/lisp/info.el
index 84fc13ccc7da4776211f92426f204022eb5421a3..b8e30fadef3982883cdb0c7016e7e5a29e4b6e26 100644 (file)
--- 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.