aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2010-06-02 23:07:39 -0700
committerGlenn Morris2010-06-02 23:07:39 -0700
commit3845c322ce0ee880e65c4cf1ebfec87e5cae129d (patch)
tree0a8d5f29fdd86dc659b3d68d6b16ebd1f0871995
parentba3bf1d9519b4f5aafba9a87109ef1e7a29f7fcc (diff)
downloademacs-3845c322ce0ee880e65c4cf1ebfec87e5cae129d.tar.gz
emacs-3845c322ce0ee880e65c4cf1ebfec87e5cae129d.zip
Close bug#6336.
* lisp/desktop.el (desktop-clear-preserve-buffers): Add "*Warnings*" buffer.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/desktop.el4
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c41d1d6283a..17f6973dff4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12010-06-03 Glenn Morris <rgm@gnu.org>
2
3 * desktop.el (desktop-clear-preserve-buffers):
4 Add "*Warnings*" buffer. (Bug#6336)
5
12010-06-02 Dan Nicolaescu <dann@ics.uci.edu> 62010-06-02 Dan Nicolaescu <dann@ics.uci.edu>
2 7
3 * vc-dir.el (vc-dir-update): Remove entries with a nil state (bug#5539). 8 * vc-dir.el (vc-dir-update): Remove entries with a nil state (bug#5539).
diff --git a/lisp/desktop.el b/lisp/desktop.el
index 0e6153cfe47..60bc044696b 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -303,10 +303,12 @@ to the value obtained by evaluating FORM."
303 :version "22.1") 303 :version "22.1")
304 304
305(defcustom desktop-clear-preserve-buffers 305(defcustom desktop-clear-preserve-buffers
306 '("\\*scratch\\*" "\\*Messages\\*" "\\*server\\*" "\\*tramp/.+\\*") 306 '("\\*scratch\\*" "\\*Messages\\*" "\\*server\\*" "\\*tramp/.+\\*"
307 "\\*Warnings\\*")
307 "List of buffers that `desktop-clear' should not delete. 308 "List of buffers that `desktop-clear' should not delete.
308Each element is a regular expression. Buffers with a name matched by any of 309Each element is a regular expression. Buffers with a name matched by any of
309these won't be deleted." 310these won't be deleted."
311 :version "23.3" ; added Warnings - bug#6336
310 :type '(repeat string) 312 :type '(repeat string)
311 :group 'desktop) 313 :group 'desktop)
312 314