* lisp/info.el (info-initialize): Revert 2014-01-10 change.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8c097ad87b0b416ee5cfe7fa8a022ed37800b48b..9f8b55771bbcc2f75cea0722ee3aa71d5e1b2539 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2014-02-15  Glenn Morris  <rgm@gnu.org>
+
+       * info.el (info-initialize): Revert 2014-01-10 change.
+
 2014-02-14  Glenn Morris  <rgm@gnu.org>
 
        * replace.el (map-query-replace-regexp)

diff --git a/lisp/info.el b/lisp/info.el
index 97b9c809d7603920b936de9c612032166ec5dbea..77f69f914c9b226ddcfd504b46a3b2037121052d 100644 (file)
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -732,14 +732,6 @@ 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)))
-            (when (file-directory-p dir)
-              (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.