[Emacs-diffs] emacs/lisp ChangeLog files.el

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/06/28 16:09:50

Modified files:
        lisp           : ChangeLog files.el 

Log message:
        * files.el (trash-directory): Fix defcustom type.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15737&r2=1.15738
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/files.el?cvsroot=emacs&r1=1.1053&r2=1.1054

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15737
retrieving revision 1.15738
diff -u -b -r1.15737 -r1.15738
--- ChangeLog   28 Jun 2009 05:06:56 -0000      1.15737
+++ ChangeLog   28 Jun 2009 16:09:46 -0000      1.15738
@@ -1,3 +1,7 @@
+2009-06-28  David De La Harpe Golden  <address@hidden>
+
+       * files.el (trash-directory): Fix defcustom type.
+
 2009-03-28  Juri Linkov  <address@hidden>
 
        * help-fns.el (describe-function-1): Correctly locate adviced

Index: files.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/files.el,v
retrieving revision 1.1053
retrieving revision 1.1054
diff -u -b -r1.1053 -r1.1054
--- files.el    28 Jun 2009 04:54:11 -0000      1.1053
+++ files.el    28 Jun 2009 16:09:50 -0000      1.1054
@@ -6016,7 +6016,7 @@
 is not defined.
 Relative paths are interpreted relative to `default-directory'.
 If the value is nil, Emacs uses a freedesktop.org-style trashcan."
-  :type 'directory
+  :type  '(choice (const nil) directory)
   :group 'auto-save
   :version "23.2")