(feedmail-from-line): Allow t.

(feedmail-message-id-suffix): Allow nil.

diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el
index 6caf63db494eb1660e6ad182a276074c46d3ad41..6f878c29b6b9f9371174606fed4fb29eeb651428 100644 (file)
--- a/lisp/mail/feedmail.el
+++ b/lisp/mail/feedmail.el
@@ -527,7 +527,7 @@ chance of being wrong.  It also honors `mail-from-style'.  Better to set
 this variable explicitly to the string you want or find some other way
 to arrange for the message to get a From: line."
   :group 'feedmail-headers
-  :type '(choice (const nil) string)
+  :type '(choice (const t) (const nil) string)
   )
 
 
@@ -637,7 +637,7 @@ used.  If the value of `feedmail-message-id-suffix' contains an \"@\" character,
 the string will be used verbatim, else an \"@\" character will be prepended
 automatically."
   :group 'feedmail-headers
-  :type 'string
+  :type '(choice (const nil) string)
   )
 
 ;; this was suggested in various forms by several people; first was