summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/simple.el2
2 files changed, 3 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bf2faf44f63..749f7cc352f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
2006-07-11 Chong Yidong <cyd@stupidchicken.com>
+ * simple.el (undo-ask-before-discard): Set to nil.
+
* vc.el (vc-exec-after): Don't delete process manually.
(vc-print-log): Run log-view-mode in process sentinel inside
inhibit-read-only. Don't shrink window due to timing issues.
diff --git a/lisp/simple.el b/lisp/simple.el
index 94fe6b431e4..2af4bbd1d76 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1669,7 +1669,7 @@ is not *inside* the region START...END."
'(0 . 0)))
'(0 . 0)))
-(defcustom undo-ask-before-discard t
+(defcustom undo-ask-before-discard nil
"If non-nil ask about discarding undo info for the current command.
Normally, Emacs discards the undo info for the current command if
it exceeds `undo-outer-limit'. But if you set this option