[Emacs-diffs] /srv/bzr/emacs/emacs-23 r99832: Close bug#6336.

[Glenn Morris]

------------------------------------------------------------
revno: 99832
committer: Glenn Morris <address@hidden>
branch nick: emacs-23
timestamp: Wed 2010-06-02 23:07:39 -0700
message:
  Close bug#6336.
  * lisp/desktop.el (desktop-clear-preserve-buffers): Add "*Warnings*" buffer.
modified:
  lisp/ChangeLog
  lisp/desktop.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-06-02 04:54:55 +0000
+++ b/lisp/ChangeLog    2010-06-03 06:07:39 +0000
@@ -1,3 +1,8 @@
+2010-06-03  Glenn Morris  <address@hidden>
+
+       * desktop.el (desktop-clear-preserve-buffers):
+       Add "*Warnings*" buffer.  (Bug#6336)
+
 2010-06-02  Dan Nicolaescu  <address@hidden>
 
        * vc-dir.el (vc-dir-update): Remove entries with a nil state (bug#5539).

=== modified file 'lisp/desktop.el'
--- a/lisp/desktop.el   2010-05-10 00:30:08 +0000
+++ b/lisp/desktop.el   2010-06-03 06:07:39 +0000
@@ -303,10 +303,12 @@
   :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)