[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r115954: If running uninstalled, always put our own
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] trunk r115954: If running uninstalled, always put our own info files first |
Date: |
Fri, 10 Jan 2014 05:39:36 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 115954
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2014-01-09 21:39:29 -0800
message:
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.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/info.el info.el-20091113204419-o5vbwnq5f7feedwu-261
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-01-10 02:44:51 +0000
+++ b/lisp/ChangeLog 2014-01-10 05:39:29 +0000
@@ -1,5 +1,8 @@
2014-01-10 Glenn Morris <address@hidden>
+ * 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 <address@hidden>
=== modified file 'lisp/info.el'
--- a/lisp/info.el 2014-01-01 07:43:34 +0000
+++ b/lisp/info.el 2014-01-10 05:39:29 +0000
@@ -732,6 +732,13 @@
(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.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r115954: If running uninstalled, always put our own info files first,
Glenn Morris <=