*** empty log message ***

2 files changed, 7 insertions, 0 deletions

diff --git a/etc/NEWS b/etc/NEWS
index c92669a810f..0cd326c4226 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -43,6 +43,9 @@ description of aspects specific to the Mac.
 
 * Changes in Emacs 21.1
 
+** The new user-option `confirm-kill-emacs' can be customized to
+let Emacs ask for confirmation before exiting.
+
 ** The <home> end <end> keys now move to the beginning or end of the
 current line, respectively.  C-<home> and C-<end> move to the
 beginning and end of the buffer.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 59b07a26cdd..e822dfeffe2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2001-01-10  Gerd Moellmann  <gerd@gnu.org>
 
+        * files.el (confirm-kill-emacs): New user-option.
+        (save-buffers-kill-emacs): Ask for final confirmation before
+        killing Emacs.
+
         * isearch.el (isearch-done): Set isearch-lazy-highlight-start
         to nil.