diff options
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/info.el | 7 |
2 files changed, 10 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0c1b111e3b0..7fecb6b58c3 100644 --- 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 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. |