diff options
| author | Richard M. Stallman | 1994-11-01 05:56:55 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1994-11-01 05:56:55 +0000 |
| commit | b7521474262fe8d65ebe91c1fc668d598426a9f0 (patch) | |
| tree | 8e9d7378a5585ea62c49dbd1e8ad8e46a6ef0202 | |
| parent | 57f2b3e4f3beff5cb29944f9101a5719f154660e (diff) | |
| download | emacs-b7521474262fe8d65ebe91c1fc668d598426a9f0.tar.gz emacs-b7521474262fe8d65ebe91c1fc668d598426a9f0.zip | |
On windows-nt, load ls-lisp and winnt.
Treat windows-nt like ms-dos for DOC file name.
| -rw-r--r-- | lisp/loadup.el | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lisp/loadup.el b/lisp/loadup.el index d0afa2034ec..1912fe6326b 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el | |||
| @@ -97,6 +97,11 @@ | |||
| 97 | (progn | 97 | (progn |
| 98 | (garbage-collect) | 98 | (garbage-collect) |
| 99 | (load "vms-patch"))) | 99 | (load "vms-patch"))) |
| 100 | (if (eq system-type 'windows-nt) | ||
| 101 | (progn | ||
| 102 | (garbage-collect) | ||
| 103 | (load "ls-lisp") | ||
| 104 | (load "winnt"))) | ||
| 100 | (if (eq system-type 'ms-dos) | 105 | (if (eq system-type 'ms-dos) |
| 101 | (progn | 106 | (progn |
| 102 | (load "ls-lisp") | 107 | (load "ls-lisp") |
| @@ -160,7 +165,7 @@ | |||
| 160 | (setq name (concat (downcase (substring name 0 (match-beginning 0))) | 165 | (setq name (concat (downcase (substring name 0 (match-beginning 0))) |
| 161 | "-" | 166 | "-" |
| 162 | (substring name (match-end 0))))) | 167 | (substring name (match-end 0))))) |
| 163 | (if (eq system-type 'ms-dos) | 168 | (if (memq system-type '(ms-dos windows-nt)) |
| 164 | (setq name (expand-file-name | 169 | (setq name (expand-file-name |
| 165 | (if (fboundp 'make-frame) "DOC-X" "DOC") "../etc")) | 170 | (if (fboundp 'make-frame) "DOC-X" "DOC") "../etc")) |
| 166 | (setq name (concat (expand-file-name "../etc/DOC-") name)) | 171 | (setq name (concat (expand-file-name "../etc/DOC-") name)) |