From: Edward M. Reingold <reingold@emr.cs.iit.edu>
Date: Mon, 11 May 1998 15:48:24 +0000 (+0000)
Subject: On exiting, don't signal error when user changes mind.
X-Git-Tag: emacs-20.3~1049
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=38023020788a342bbe71ebbf30c3b4d1fd8c4155;p=emacs.git

On exiting, don't signal error when user changes mind.
---

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."
   "Get out of the calendar window and hide it and related buffers."
   (interactive)
   (let* ((diary-buffer (get-file-buffer diary-file)))
-    (if (and diary-buffer (buffer-modified-p diary-buffer)
-	     (not
-	      (yes-or-no-p
-	       "Diary modified; do you really want to exit the calendar? ")))
-	(beep)
+    (if (or (not diary-buffer)
+            (not (buffer-modified-p diary-buffer))
+            (yes-or-no-p
+             "Diary modified; do you really want to exit the calendar? "))
       ;; Need to do this multiple times because one time can replace some
       ;; calendar-related buffers with other calendar-related buffers
       (mapcar (lambda (x)