diff options
| author | Eli Zaretskii | 2000-05-02 12:03:43 +0000 |
|---|---|---|
| committer | Eli Zaretskii | 2000-05-02 12:03:43 +0000 |
| commit | 4b33deaa565f66f28f62b7567f6377ca485446fe (patch) | |
| tree | 5c7d4241720de057b3b7bc05ad0472249c0477bf | |
| parent | 874d1079394d6ca815eeb01014b1105433e439c6 (diff) | |
| download | emacs-4b33deaa565f66f28f62b7567f6377ca485446fe.tar.gz emacs-4b33deaa565f66f28f62b7567f6377ca485446fe.zip | |
(auto-save-list-file-prefix): For ms-dos, set the
default prefix to `~/_emacs.d/auto-save.list/_s'.
(normal-top-level): Create the directory for auto-save files, if
it doesn't already exist, in the ms-dos case only.
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/startup.el | 29 |
2 files changed, 25 insertions, 11 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 733a94f5b3d..9cdbf3b88e2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,12 @@ | |||
| 1 | 2000-05-02 Eli Zaretskii <eliz@is.elta.co.il> | 1 | 2000-05-02 Eli Zaretskii <eliz@is.elta.co.il> |
| 2 | 2 | ||
| 3 | * startup.el (auto-save-list-file-prefix): For ms-dos, set the | ||
| 4 | default prefix to `~/_emacs.d/auto-save.list/_s'. | ||
| 5 | (normal-top-level): Create the directory for auto-save files, if | ||
| 6 | it doesn't already exist (in the ms-dos case only). | ||
| 7 | |||
| 8 | 2000-05-02 Eli Zaretskii <eliz@is.elta.co.il> | ||
| 9 | |||
| 3 | * international/mule-cmds.el (set-language-environment): Don't | 10 | * international/mule-cmds.el (set-language-environment): Don't |
| 4 | concat an integer (dos-codepage), use format instead. | 11 | concat an integer (dos-codepage), use format instead. |
| 5 | 12 | ||
diff --git a/lisp/startup.el b/lisp/startup.el index f410c5026cb..f7383b6881b 100644 --- a/lisp/startup.el +++ b/lisp/startup.el | |||
| @@ -319,7 +319,7 @@ after your init file is read, in case it sets `mail-host-address'." | |||
| 319 | (defcustom auto-save-list-file-prefix | 319 | (defcustom auto-save-list-file-prefix |
| 320 | (cond ((eq system-type 'ms-dos) | 320 | (cond ((eq system-type 'ms-dos) |
| 321 | ;; MS-DOS cannot have initial dot, and allows only 8.3 names | 321 | ;; MS-DOS cannot have initial dot, and allows only 8.3 names |
| 322 | "~/_s") | 322 | "~/_emacs.d/auto-save.list/_s") |
| 323 | (t | 323 | (t |
| 324 | "~/.emacs.d/auto-save-list/.saves-")) | 324 | "~/.emacs.d/auto-save-list/.saves-")) |
| 325 | "Prefix for generating `auto-save-list-file-name'. | 325 | "Prefix for generating `auto-save-list-file-name'. |
| @@ -444,16 +444,23 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'." | |||
| 444 | (setq auto-save-list-file-name | 444 | (setq auto-save-list-file-name |
| 445 | ;; Under MS-DOS our PID is almost always reused between | 445 | ;; Under MS-DOS our PID is almost always reused between |
| 446 | ;; Emacs invocations. We need something more unique. | 446 | ;; Emacs invocations. We need something more unique. |
| 447 | (if (eq system-type 'ms-dos) | 447 | (cond ((eq system-type 'ms-dos) |
| 448 | (concat | 448 | ;; We are going to access the auto-save |
| 449 | (make-temp-name | 449 | ;; directory, so make sure it exists. |
| 450 | (expand-file-name auto-save-list-file-prefix)) | 450 | (make-directory |
| 451 | "~") | 451 | (file-name-directory auto-save-list-file-prefix) |
| 452 | 452 | t) | |
| 453 | (expand-file-name (format "%s%d-%s~" | 453 | (concat |
| 454 | auto-save-list-file-prefix | 454 | (make-temp-name |
| 455 | (emacs-pid) | 455 | (expand-file-name |
| 456 | (system-name))))))) | 456 | auto-save-list-file-prefix)) |
| 457 | "~")) | ||
| 458 | (t | ||
| 459 | (expand-file-name | ||
| 460 | (format "%s%d-%s~" | ||
| 461 | auto-save-list-file-prefix | ||
| 462 | (emacs-pid) | ||
| 463 | (system-name)))))))) | ||
| 457 | (run-hooks 'emacs-startup-hook) | 464 | (run-hooks 'emacs-startup-hook) |
| 458 | (and term-setup-hook | 465 | (and term-setup-hook |
| 459 | (run-hooks 'term-setup-hook)) | 466 | (run-hooks 'term-setup-hook)) |