procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

If running uninstalled, always put our own info files first

Browse source 
* lisp/info.el (info-initialize): If running uninstalled, ensure our
own info files are always found first, even if INFOPATH is set.
This commit is contained in:
Glenn Morris 2014-01-09 21:39:29 -08:00
parent 0ede4df37e
commit dad6fae748
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lisp/ChangeLog
View file

@ -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>

7
lisp/info.el
View file

@ -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.