diff options
| author | Karoly Lorentey | 2006-05-03 11:56:53 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2006-05-03 11:56:53 +0000 |
| commit | c044516d384ff70e820686d4e995dcc23ee22e6f (patch) | |
| tree | 4a9b52cf3e7da73040903b719dfca8113a765884 /lisp/simple.el | |
| parent | b33c71f58623306001d4d4fe4f7354d8c360edaa (diff) | |
| parent | 9d6bb9e0af2671a4deca1509f4a2d5655400f67a (diff) | |
| download | emacs-c044516d384ff70e820686d4e995dcc23ee22e6f.tar.gz emacs-c044516d384ff70e820686d4e995dcc23ee22e6f.zip | |
Merged from emacs@sv.gnu.org
Patches applied:
* emacs@sv.gnu.org/emacs--devo--0--patch-252
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-253
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-254
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-255
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-256
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-257
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-258
Clean up lisp/gnus/ChangeLog a bit
* emacs@sv.gnu.org/emacs--devo--0--patch-259
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-260
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-261
lisp/replace.el (occur-engine): Bind `inhibit-field-text-motion' to t
* emacs@sv.gnu.org/emacs--devo--0--patch-262
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-96
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-97
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-98
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-554
Diffstat (limited to 'lisp/simple.el')
| -rw-r--r-- | lisp/simple.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/simple.el b/lisp/simple.el index 99192d79ec0..bf620c2533d 100644 --- a/lisp/simple.el +++ b/lisp/simple.el | |||
| @@ -1697,7 +1697,7 @@ This variable only matters if `undo-ask-before-discard' is non-nil.") | |||
| 1697 | ;; but we don't want to ask the question again. | 1697 | ;; but we don't want to ask the question again. |
| 1698 | (setq undo-extra-outer-limit (+ size 50000)) | 1698 | (setq undo-extra-outer-limit (+ size 50000)) |
| 1699 | (if (let (use-dialog-box track-mouse executing-kbd-macro ) | 1699 | (if (let (use-dialog-box track-mouse executing-kbd-macro ) |
| 1700 | (yes-or-no-p (format "Buffer %s undo info is %d bytes long; discard it? " | 1700 | (yes-or-no-p (format "Buffer `%s' undo info is %d bytes long; discard it? " |
| 1701 | (buffer-name) size))) | 1701 | (buffer-name) size))) |
| 1702 | (progn (setq buffer-undo-list nil) | 1702 | (progn (setq buffer-undo-list nil) |
| 1703 | (setq undo-extra-outer-limit nil) | 1703 | (setq undo-extra-outer-limit nil) |
| @@ -1705,7 +1705,7 @@ This variable only matters if `undo-ask-before-discard' is non-nil.") | |||
| 1705 | nil)) | 1705 | nil)) |
| 1706 | (display-warning '(undo discard-info) | 1706 | (display-warning '(undo discard-info) |
| 1707 | (concat | 1707 | (concat |
| 1708 | (format "Buffer %s undo info was %d bytes long.\n" | 1708 | (format "Buffer `%s' undo info was %d bytes long.\n" |
| 1709 | (buffer-name) size) | 1709 | (buffer-name) size) |
| 1710 | "The undo info was discarded because it exceeded \ | 1710 | "The undo info was discarded because it exceeded \ |
| 1711 | `undo-outer-limit'. | 1711 | `undo-outer-limit'. |