# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1246205386 0
# Node ID fe1b52515c0ff31cb8ec3a8c13ccff26e25657d0
# Parent  64011e3b89f5dc1d72ef647647fce9e68098b701
* files.el (trash-directory): Fix defcustom type.

diff -r 64011e3b89f5 -r fe1b52515c0f lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Jun 28 15:32:20 2009 +0000
+++ b/lisp/ChangeLog	Sun Jun 28 16:09:46 2009 +0000
@@ -1,3 +1,7 @@
+2009-06-28  David De La Harpe Golden  <david@harpegolden.net>
+
+	* files.el (trash-directory): Fix defcustom type.
+
 2009-03-28  Juri Linkov  <juri@jurta.org>
 
 	* help-fns.el (describe-function-1): Correctly locate adviced
diff -r 64011e3b89f5 -r fe1b52515c0f lisp/files.el
--- a/lisp/files.el	Sun Jun 28 15:32:20 2009 +0000
+++ b/lisp/files.el	Sun Jun 28 16:09:46 2009 +0000
@@ -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")