(Info-directory-list): For msdos, don't check for

exec-directory != ../lib-src (since we use wrapped binaries).

diff --git a/lisp/info.el b/lisp/info.el
index 524b0b74af5d8cb31ea36d57307aa4e2ab2cd8c8..342892eb4f2bfb949df73be00b748e4f8d393d48 100644 (file)
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -65,10 +65,15 @@ in paths.el.")
          (nreverse list))
       (if (or (member sibling Info-default-directory-list)
              (not (file-exists-p sibling))
-             ;; Use invocation-directory for Info only if we used it for
-             ;; exec-directory also.
-             (not (string= exec-directory
-                           (expand-file-name "../lib-src/" (invocation-directory)))))
+             ;; On MS-DOS, we use movable executables always,
+             ;; and we must always find the Info dir at run time.
+             (if (eq system-type 'ms-dos)
+                 nil
+               ;; Use invocation-directory for Info only if we used it for
+               ;; exec-directory also.
+               (not (string= exec-directory
+                             (expand-file-name "../lib-src/"
+                                               (invocation-directory))))))
          Info-default-directory-list
        (reverse (cons sibling (cdr (reverse Info-default-directory-list)))))))
   "List of directories to search for Info documentation files.