aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEdward M. Reingold1998-05-11 15:48:24 +0000
committerEdward M. Reingold1998-05-11 15:48:24 +0000
commit38023020788a342bbe71ebbf30c3b4d1fd8c4155 (patch)
tree17524528a04ed24976f2b3350e6f06e9acca5e17
parentb5305eb0516c217caba18b37ff8c993acaa7cfc0 (diff)
downloademacs-38023020788a342bbe71ebbf30c3b4d1fd8c4155.tar.gz
emacs-38023020788a342bbe71ebbf30c3b4d1fd8c4155.zip
On exiting, don't signal error when user changes mind.
-rw-r--r--lisp/calendar/calendar.el9
1 files changed, 4 insertions, 5 deletions
diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index 65e2ace68fc..10498e5b088 100644
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -2096,11 +2096,10 @@ the STRINGS are just concatenated and the result truncated."
2096 "Get out of the calendar window and hide it and related buffers." 2096 "Get out of the calendar window and hide it and related buffers."
2097 (interactive) 2097 (interactive)
2098 (let* ((diary-buffer (get-file-buffer diary-file))) 2098 (let* ((diary-buffer (get-file-buffer diary-file)))
2099 (if (and diary-buffer (buffer-modified-p diary-buffer) 2099 (if (or (not diary-buffer)
2100 (not 2100 (not (buffer-modified-p diary-buffer))
2101 (yes-or-no-p 2101 (yes-or-no-p
2102 "Diary modified; do you really want to exit the calendar? "))) 2102 "Diary modified; do you really want to exit the calendar? "))
2103 (beep)
2104 ;; Need to do this multiple times because one time can replace some 2103 ;; Need to do this multiple times because one time can replace some
2105 ;; calendar-related buffers with other calendar-related buffers 2104 ;; calendar-related buffers with other calendar-related buffers
2106 (mapcar (lambda (x) 2105 (mapcar (lambda (x)