# HG changeset patch
# User Eli Zaretskii <eliz@gnu.org>
# Date 1247918344 0
# Node ID a5f754c1ef7e7d9cdd6775ede9eea646c66333f1
# Parent  f261612c30a6f880749cf598d514bb8ff63d3a15
*** empty log message ***

diff -r f261612c30a6 -r a5f754c1ef7e lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Jul 18 11:58:39 2009 +0000
+++ b/lisp/ChangeLog	Sat Jul 18 11:59:04 2009 +0000
@@ -1,5 +1,14 @@
 2009-07-18  Eli Zaretskii  <eliz@gnu.org>
 
+	* desktop.el (desktop-buffers-not-to-save): Default value is nil.
+	Accept nil in addition to a regexp.
+	(desktop-files-not-to-save): Add "(ftp)$" to the default regexp.
+	Accept nil in addition to a regexp.
+	(desktop-save-buffer-p): Don't use desktop-buffers-not-to-save for
+	buffers that have an associated file.  Handle nil values of
+	desktop-buffers-not-to-save and desktop-files-not-to-save.
+	(Bug#3833)
+
 	* term/pc-win.el (x-selection-owner-p, x-own-selection-internal)
 	(x-disown-selection-internal): New functions.