diff options
| author | Andreas Schwab <schwab@linux-m68k.org> | 2010-06-10 00:08:50 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@linux-m68k.org> | 2010-06-10 00:08:50 +0200 |
| commit | 639b2760f19231881f753c8f1f7822eab457c751 (patch) | |
| tree | e18ffb6ca9d3ed2ad8cf2e38de2caa44e52efaaa /lisp/desktop.el | |
| parent | c1b1acc2f7a3b658407afe4562a88ea8c62671d9 (diff) | |
| parent | e454a4a330cc6524cf0d2604b4fafc32d5bda795 (diff) | |
| download | emacs-639b2760f19231881f753c8f1f7822eab457c751.tar.gz emacs-639b2760f19231881f753c8f1f7822eab457c751.tar.bz2 emacs-639b2760f19231881f753c8f1f7822eab457c751.zip | |
Merge from emacs-23
Diffstat (limited to 'lisp/desktop.el')
| -rw-r--r-- | lisp/desktop.el | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/desktop.el b/lisp/desktop.el index 5c2e6d9b2f5..8f0b8075cdf 100644 --- a/lisp/desktop.el +++ b/lisp/desktop.el @@ -303,10 +303,12 @@ to the value obtained by evaluating FORM." :version "22.1") (defcustom desktop-clear-preserve-buffers - '("\\*scratch\\*" "\\*Messages\\*" "\\*server\\*" "\\*tramp/.+\\*") + '("\\*scratch\\*" "\\*Messages\\*" "\\*server\\*" "\\*tramp/.+\\*" + "\\*Warnings\\*") "List of buffers that `desktop-clear' should not delete. Each element is a regular expression. Buffers with a name matched by any of these won't be deleted." + :version "23.3" ; added Warnings - bug#6336 :type '(repeat string) :group 'desktop) |