aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman1994-11-01 05:54:58 +0000
committerRichard M. Stallman1994-11-01 05:54:58 +0000
commit57f2b3e4f3beff5cb29944f9101a5719f154660e (patch)
tree524e755e9c10e26d4fa39fe5cf990bbeb05140e5
parent2cd0169dc8e5d7777b455050a1088a75696f6118 (diff)
downloademacs-57f2b3e4f3beff5cb29944f9101a5719f154660e.tar.gz
emacs-57f2b3e4f3beff5cb29944f9101a5719f154660e.zip
(Info-directory-list): Treat windows-nt like ms-dos.
-rw-r--r--lisp/info.el8
1 files changed, 5 insertions, 3 deletions
diff --git a/lisp/info.el b/lisp/info.el
index 54b554719b5..000ceb77138 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -55,7 +55,9 @@ in paths.el.")
55 55
56(defvar Info-directory-list 56(defvar Info-directory-list
57 (let ((path (getenv "INFOPATH")) 57 (let ((path (getenv "INFOPATH"))
58 (sep (if (eq system-type 'ms-dos) ";" ":")) 58 (sep (if (or (eq system-type 'ms-dos)
59 (eq system-type 'windows-nt))
60 ";" ":"))
59 (sibling (expand-file-name "../info/" (invocation-directory)))) 61 (sibling (expand-file-name "../info/" (invocation-directory))))
60 (if path 62 (if path
61 (let ((list nil) 63 (let ((list nil)
@@ -68,9 +70,9 @@ in paths.el.")
68 (nreverse list)) 70 (nreverse list))
69 (if (or (member sibling Info-default-directory-list) 71 (if (or (member sibling Info-default-directory-list)
70 (not (file-exists-p sibling)) 72 (not (file-exists-p sibling))
71 ;; On MS-DOS, we use movable executables always, 73 ;; On DOS/NT, we use movable executables always,
72 ;; and we must always find the Info dir at run time. 74 ;; and we must always find the Info dir at run time.
73 (if (eq system-type 'ms-dos) 75 (if (or (eq system-type 'ms-dos) (eq system-type 'windows-nt))
74 nil 76 nil
75 ;; Use invocation-directory for Info only if we used it for 77 ;; Use invocation-directory for Info only if we used it for
76 ;; exec-directory also. 78 ;; exec-directory also.