aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman1994-06-21 15:39:44 +0000
committerRichard M. Stallman1994-06-21 15:39:44 +0000
commit718b4478bfe8dbd6a9f6df7aed6129b11c9ae96c (patch)
tree278517029fa4acfa9dd518b1252b8b0fa370c4d7
parent8d45a19e51d0aee0a0550ed1facaabaeb13954fe (diff)
downloademacs-718b4478bfe8dbd6a9f6df7aed6129b11c9ae96c.tar.gz
emacs-718b4478bfe8dbd6a9f6df7aed6129b11c9ae96c.zip
(Info-directory-list): For msdos, don't check for
exec-directory != ../lib-src (since we use wrapped binaries).
-rw-r--r--lisp/info.el13
1 files changed, 9 insertions, 4 deletions
diff --git a/lisp/info.el b/lisp/info.el
index 524b0b74af5..342892eb4f2 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -65,10 +65,15 @@ in paths.el.")
65 (nreverse list)) 65 (nreverse list))
66 (if (or (member sibling Info-default-directory-list) 66 (if (or (member sibling Info-default-directory-list)
67 (not (file-exists-p sibling)) 67 (not (file-exists-p sibling))
68 ;; Use invocation-directory for Info only if we used it for 68 ;; On MS-DOS, we use movable executables always,
69 ;; exec-directory also. 69 ;; and we must always find the Info dir at run time.
70 (not (string= exec-directory 70 (if (eq system-type 'ms-dos)
71 (expand-file-name "../lib-src/" (invocation-directory))))) 71 nil
72 ;; Use invocation-directory for Info only if we used it for
73 ;; exec-directory also.
74 (not (string= exec-directory
75 (expand-file-name "../lib-src/"
76 (invocation-directory))))))
72 Info-default-directory-list 77 Info-default-directory-list
73 (reverse (cons sibling (cdr (reverse Info-default-directory-list))))))) 78 (reverse (cons sibling (cdr (reverse Info-default-directory-list)))))))
74 "List of directories to search for Info documentation files. 79 "List of directories to search for Info documentation files.