Mercurial > emacs

comparison lisp/desktop.el @ 109218:8929f83798c1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from mainline.
author Katsumi Yamaoka <katsumi@flagship2>
date Thu, 10 Jun 2010 11:34:20 +0000
parents d418516def73
children 6c9f59d296d3
comparison
equal deleted inserted replaced
109217:40e65e1697a4 109218:8929f83798c1
301 :type '(repeat (restricted-sexp :match-alternatives (symbolp consp))) 301 :type '(repeat (restricted-sexp :match-alternatives (symbolp consp)))
302 :group 'desktop 302 :group 'desktop
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.
308 Each element is a regular expression. Buffers with a name matched by any of 309 Each element is a regular expression. Buffers with a name matched by any of
309 these won't be deleted." 310 these 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
313 ;;;###autoload 315 ;;;###autoload
314 (defcustom desktop-locals-to-save 316 (defcustom desktop-locals-to-save