Merged in changes from CVS trunk.

[bpt/emacs.git] / lisp / gnus / mailcap.el

diff --git a/lisp/gnus/mailcap.el b/lisp/gnus/mailcap.el
index cd31fd6..6d35e21 100644 (file)
--- a/lisp/gnus/mailcap.el
+++ b/lisp/gnus/mailcap.el
@@ -271,10 +271,13 @@ validity.  Otherwise, if it is a non-function Lisp symbol or list
 whose car is a symbol, it is `eval'led to yield the validity.  If it
 is a string or list of strings, it represents a shell command to run
 to return a true or false shell value for the validity.")
+(put 'mailcap-mime-data 'risky-local-variable t)
 
 (defcustom mailcap-download-directory nil
-  "*Where downloaded files should go by default."
-  :type 'directory
+  "*Directory to which `mailcap-save-binary-file' downloads files by default.
+nil means your home directory."
+  :type '(choice (const :tag "Home directory" nil)
+                directory)
   :group 'mailcap)
 
 ;;;
@@ -304,7 +307,7 @@ If you are unsure what to do, please answer \"no\"."
   "Text of warning message displayed by `mailcap-maybe-eval'.
 Make sure that this text consists only of few text lines.  Otherwise,
 Gnus might fail to display all of it.")
-  
+
 (defun mailcap-maybe-eval ()
   "Maybe evaluate a buffer of Emacs Lisp code."
   (let ((lisp-buffer (current-buffer)))
@@ -944,4 +947,5 @@ If FORCE, re-parse even if already parsed."
 
 (provide 'mailcap)
 
+;;; arch-tag: 1fd4f9c9-c305-4d2e-9747-3a4d45baa0bd
 ;;; mailcap.el ends here