aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2014-02-14 19:58:38 -0800
committerGlenn Morris2014-02-14 19:58:38 -0800
commit5d645ea4ee6c36009bd9d74a2c4cbb3438a62ded (patch)
tree4ce46a316996f5fcae08c95a12a22b78844bc1a7
parentab837c608327848d7a9272055dac072f9d08918f (diff)
downloademacs-5d645ea4ee6c36009bd9d74a2c4cbb3438a62ded.tar.gz
emacs-5d645ea4ee6c36009bd9d74a2c4cbb3438a62ded.zip
* lisp/info.el (info-initialize): Revert 2014-01-10 change.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/info.el8
2 files changed, 4 insertions, 8 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8c097ad87b0..9f8b55771bb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12014-02-15 Glenn Morris <rgm@gnu.org>
2
3 * info.el (info-initialize): Revert 2014-01-10 change.
4
12014-02-14 Glenn Morris <rgm@gnu.org> 52014-02-14 Glenn Morris <rgm@gnu.org>
2 6
3 * replace.el (map-query-replace-regexp) 7 * replace.el (map-query-replace-regexp)
diff --git a/lisp/info.el b/lisp/info.el
index 97b9c809d76..77f69f914c9 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -732,14 +732,6 @@ in `Info-file-supports-index-cookies-list'."
732 (Info-default-dirs)) 732 (Info-default-dirs))
733 (split-string path sep)) 733 (split-string path sep))
734 (Info-default-dirs)))) 734 (Info-default-dirs))))
735 ;; If we are running uninstalled, our own Info files should
736 ;; always come first. If INFOPATH was set, they might not.
737 (and path
738 installation-directory
739 (let ((dir (expand-file-name "info/" installation-directory)))
740 (when (file-directory-p dir)
741 (setq Info-directory-list (delete dir Info-directory-list))
742 (push dir Info-directory-list))))
743 ;; For a self-contained (ie relocatable) NS build, AFAICS we 735 ;; For a self-contained (ie relocatable) NS build, AFAICS we
744 ;; always want the included info directory to be at the head of 736 ;; always want the included info directory to be at the head of
745 ;; the search path, unless it's already in INFOPATH somewhere. 737 ;; the search path, unless it's already in INFOPATH somewhere.