aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Hansen2006-05-14 20:26:37 +0000
committerLars Hansen2006-05-14 20:26:37 +0000
commit6c27fdb95db3c21882adde04366ae25a01c3c896 (patch)
tree000579e16f2998ec416a3131a6631b25bf5a6463
parent79fb0ab7fac07f38a670e159278f90fedbd8afb6 (diff)
downloademacs-6c27fdb95db3c21882adde04366ae25a01c3c896.tar.gz
emacs-6c27fdb95db3c21882adde04366ae25a01c3c896.zip
(desktop-missing-file-warning): Fix docstring.
(desktop-restore-file-buffer): Correct question asked on missing file.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/desktop.el4
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2b209d01022..325fbd69274 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12006-05-14 Lars Hansen <larsh@soem.dk>
2 * desktop.el (desktop-missing-file-warning): Fix docstring.
3 (desktop-restore-file-buffer): Correct question asked on missing
4 file.
5
12006-05-14 Kim F. Storm <storm@cua.dk> 62006-05-14 Kim F. Storm <storm@cua.dk>
2 7
3 * progmodes/cc-subword.el (c-forward-subword, c-backward-subword): 8 * progmodes/cc-subword.el (c-forward-subword, c-backward-subword):
diff --git a/lisp/desktop.el b/lisp/desktop.el
index ae9142b527a..8e9d09d4d32 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -201,7 +201,7 @@ The base name of the file is specified in `desktop-base-file-name'."
201 :version "22.1") 201 :version "22.1")
202 202
203(defcustom desktop-missing-file-warning nil 203(defcustom desktop-missing-file-warning nil
204 "*If non-nil then `desktop-read' asks if a non-existent file should be recreated. 204 "If non-nil, offer to recreate the buffer of a deleted file.
205Also pause for a moment to display message about errors signaled in 205Also pause for a moment to display message about errors signaled in
206`desktop-buffer-mode-handlers'. 206`desktop-buffer-mode-handlers'.
207 207
@@ -943,7 +943,7 @@ directory DIRNAME."
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 buffer? "))
947 (message "%s" 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