diff options
| author | Eli Zaretskii | 2013-04-06 18:00:01 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2013-04-06 18:00:01 +0300 |
| commit | c31abc6232a88ea088fc930577332a33ada87dde (patch) | |
| tree | 5ec2af7afdd9e0fd634af91c963d5edc5990d25b | |
| parent | 2b57bbc04234519d208ce66bdaa04a5a1d1e4397 (diff) | |
| download | emacs-c31abc6232a88ea088fc930577332a33ada87dde.tar.gz emacs-c31abc6232a88ea088fc930577332a33ada87dde.zip | |
Fix snafu with missing etc/DOC-X.
| -rw-r--r-- | lisp/loadup.el | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/lisp/loadup.el b/lisp/loadup.el index 00c52341058..e5406b6551f 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el | |||
| @@ -311,8 +311,18 @@ | |||
| 311 | "-" | 311 | "-" |
| 312 | (substring name (match-end 0))))) | 312 | (substring name (match-end 0))))) |
| 313 | (if (memq system-type '(ms-dos windows-nt)) | 313 | (if (memq system-type '(ms-dos windows-nt)) |
| 314 | (setq name (expand-file-name | 314 | (let ((name1 (expand-file-name |
| 315 | (if (fboundp 'x-create-frame) "DOC-X" "DOC") "../etc")) | 315 | (if (fboundp 'x-create-frame) "DOC-X" "DOC") |
| 316 | "../etc"))) | ||
| 317 | ;; There will be no DOC-X on MS-Windows when we build | ||
| 318 | ;; using the Posix Makefile's. In that case, we want | ||
| 319 | ;; to create DOC-XX.YY.ZZ, as on Unix. | ||
| 320 | (if (file-exists-p name) | ||
| 321 | (setq name name1) | ||
| 322 | (setq name (concat (expand-file-name "../etc/DOC-") name)) | ||
| 323 | (if (file-exists-p name) | ||
| 324 | (delete-file name)) | ||
| 325 | (copy-file (expand-file-name "../etc/DOC") name t))) | ||
| 316 | (setq name (concat (expand-file-name "../etc/DOC-") name)) | 326 | (setq name (concat (expand-file-name "../etc/DOC-") name)) |
| 317 | (if (file-exists-p name) | 327 | (if (file-exists-p name) |
| 318 | (delete-file name)) | 328 | (delete-file name)) |