Mercurial > emacs
comparison lisp/desktop.el @ 90228:fa0da9b57058
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-82
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 542-553)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 116-121)
- Merge from emacs--cvs-trunk--0
- Update from CVS
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Mon, 19 Sep 2005 10:20:33 +0000 |
| parents | 2d92f5c9d6ae 4d1085b02d64 |
| children | 5e2d3828e89f |
comparison
equal
deleted
inserted
replaced
| 90227:10fe5fadaf89 | 90228:fa0da9b57058 |
|---|---|
| 942 (if (or (file-exists-p desktop-buffer-file-name) | 942 (if (or (file-exists-p desktop-buffer-file-name) |
| 943 (let ((msg (format "Desktop: File \"%s\" no longer exists." | 943 (let ((msg (format "Desktop: File \"%s\" no longer exists." |
| 944 desktop-buffer-file-name))) | 944 desktop-buffer-file-name))) |
| 945 (if desktop-missing-file-warning | 945 (if desktop-missing-file-warning |
| 946 (y-or-n-p (concat msg " Re-create? ")) | 946 (y-or-n-p (concat msg " Re-create? ")) |
| 947 (message msg) | 947 (message "%s" msg) |
| 948 nil))) | 948 nil))) |
| 949 (let* ((auto-insert nil) ; Disable auto insertion | 949 (let* ((auto-insert nil) ; Disable auto insertion |
| 950 (coding-system-for-read | 950 (coding-system-for-read |
| 951 (or coding-system-for-read | 951 (or coding-system-for-read |
| 952 (cdr (assq 'buffer-file-coding-system | 952 (cdr (assq 'buffer-file-coding-system |
| 1099 (args (pop desktop-buffer-args-list)) | 1099 (args (pop desktop-buffer-args-list)) |
| 1100 (buffer-name (nth 2 args)) | 1100 (buffer-name (nth 2 args)) |
| 1101 (msg (format "Desktop lazily opening %s (%s remaining)..." | 1101 (msg (format "Desktop lazily opening %s (%s remaining)..." |
| 1102 buffer-name remaining))) | 1102 buffer-name remaining))) |
| 1103 (when desktop-lazy-verbose | 1103 (when desktop-lazy-verbose |
| 1104 (message msg)) | 1104 (message "%s" msg)) |
| 1105 (let ((desktop-first-buffer nil) | 1105 (let ((desktop-first-buffer nil) |
| 1106 (desktop-buffer-ok-count 0) | 1106 (desktop-buffer-ok-count 0) |
| 1107 (desktop-buffer-fail-count 0)) | 1107 (desktop-buffer-fail-count 0)) |
| 1108 (apply 'desktop-create-buffer args) | 1108 (apply 'desktop-create-buffer args) |
| 1109 (run-hooks 'desktop-delay-hook) | 1109 (run-hooks 'desktop-delay-hook) |