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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 14f9557e78d500386d03fa300864cf3e62d536c1..be9ac8a6e9758f15733aad0cb406a86b5f3b8440 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/files.el b/lisp/files.el
index 344b31db9610d939ee869efe24e1eef689c20a4d..e2fe19c29c0bbab9236062fd6b4703e04da6acbe 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -6016,7 +6016,7 @@ This directory is only used when the function `system-move-file-to-trash'
 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")