From: Chong Yidong <cyd@stupidchicken.com>
Date: Sun, 28 Jun 2009 16:09:46 +0000 (+0000)
Subject: * files.el (trash-directory): Fix defcustom type.
X-Git-Tag: emacs-pretest-23.1.90~2401
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f7c0d93167355a7601de56f9fc21c1fd2f2b0f22;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 14f9557e78d..be9ac8a6e97 100644
--- 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 344b31db961..e2fe19c29c0 100644
--- 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")