Mercurial > emacs
comparison lisp/info.el @ 9782:7224fba93c27
(Info-directory-list): Treat windows-nt like ms-dos.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Tue, 01 Nov 1994 05:54:58 +0000 |
parents | 7d465ccfd45b |
children | b3a6fdcd63df |
comparison
equal
deleted
inserted
replaced
9781:ae6fed248fb9 | 9782:7224fba93c27 |
---|---|
53 (defvar Info-fontify-maximum-menu-size 30000 | 53 (defvar Info-fontify-maximum-menu-size 30000 |
54 "*Maximum size of menu to fontify if `Info-fontify' is non-nil.") | 54 "*Maximum size of menu to fontify if `Info-fontify' is non-nil.") |
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) |
62 idx) | 64 idx) |
63 (while (> (length path) 0) | 65 (while (> (length path) 0) |
66 path (substring path (min (1+ idx) | 68 path (substring path (min (1+ idx) |
67 (length path))))) | 69 (length path))))) |
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. |
77 (not (string= exec-directory | 79 (not (string= exec-directory |
78 (expand-file-name "../lib-src/" | 80 (expand-file-name "../lib-src/" |