[Mew-dist 15730] fix: defcustom type mismatch

[NINOMIYA Hideyuki]

こんにちは	二宮@お四国 です

以前からちょっと気になってたのですが...

choice を使って type mismatch を一掃しようキャンペーンです。

# defcustom についてはいじりたいとこ他にもありますがそれはおいヽ...
---
ICQ UIN:57442553                          二宮 秀幸@愛媛 鬼北 広見町
PGP-Fingerprint:  6C59 EC08 5B23 6490 44D0  7CD3 DA40 219F 7114 8553
PGP-Public-Key:    http://user.shikoku.ne.jp/~nin/pgp/public-key.txt
mailto:nin at example.com   http://user.shikoku.ne.jp/~nin/index.html
mailto:nin at example.com http://home.jp.freebsd.org/~nin/index.html

Index: mew-vars.el
===================================================================
RCS file: /tmp/am/da/cvs/mew/mew-vars.el,v
retrieving revision 1.10
diff -u -F(def -r1.10 mew-vars.el
--- mew-vars.el	2000/12/28 13:01:00	1.10
+++ mew-vars.el	2001/01/05 05:45:09
@@ -598,7 +598,7 @@ (defcustom mew-demo-picture mew-xemacs-p
 (defcustom mew-demo-sit-for 0
   "*A picture of cats is displayed if *non-nil* on XEmacs."
   :group 'mew-env
-  :type 'integer)
+  :type '(choice integer (const nil)))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;
@@ -850,12 +850,12 @@ (defcustom mew-summary-jump-bottom-then-
 (defcustom mew-end-of-message-string "[End of message]"
   "*A value inserted on the end of message buffer if *non-nil*."
   :group 'mew-message
-  :type 'string)
+  :type '(choice string (const nil)))
 
 (defcustom mew-end-of-part-string "[Message is continued]"
   "*A value inserted on the end of message buffer if *non-nil*."
   :group 'mew-message
-  :type 'string)
+  :type '(choice string (const nil)))
 
 (defcustom mew-break-pages t
   "*If *non-nil*, a message is broken by mew-page-delimiter."
@@ -907,37 +907,37 @@ (defcustom mew-reply-to nil
   "*A value inserted into Reply-To: field in Draft mode if *non-nil*.
 See also 'mew-config-alist'."
   :group 'mew-draft
-  :type 'string)
+  :type '(choice string (const nil)))
 
 (defcustom mew-fcc "+backup"
   "*A value inserted into Fcc: field in Draft mode if *non-nil*.
 See also 'mew-config-alist'."
   :group 'mew-draft
-  :type 'string)
+  :type '(choice string (const nil)))
 
 (defcustom mew-cc nil
   "*A value inserted into Cc: field in Draft mode if *non-nil*.
 See also 'mew-config-alist'."
   :group 'mew-draft
-  :type 'string)
+  :type '(choice string (const nil)))
 
 (defcustom mew-dcc nil
   "*A value inserted into Dcc: field in Draft mode if *non-nil*.
 See also 'mew-config-alist'."
   :group 'mew-draft
-  :type 'string)
+  :type '(choice string (const nil)))
 
 (defcustom mew-from nil
   "*A value inserted into From: field in Draft mode if *non-nil*.
 See also 'mew-config-alist'."
   :group 'mew-draft
-  :type 'string)
+  :type '(choice string (const nil)))
 
 (defcustom mew-organization nil
   "*A value inserted into Organization: field in Draft mode if *non-nil*.
 See also 'mew-config-alist'."
   :group 'mew-draft
-  :type 'string)
+  :type '(choice string (const nil)))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;
@@ -948,10 +948,12 @@ (defcustom mew-cite-prefix "> "
   "*Prefix of citation."
   :group 'mew-cite
   :type 'string)
+
 (defcustom mew-cite-hook nil
   "*If you want to use super-cite, (setq mew-cite-hook 'sc-cite-original)."
   :group 'mew-cite
   :type 'hook)
+
 (defcustom mew-before-cite-hook nil
   "Called in mew-summary-reply-with-citation before citation."
   :group 'mew-cite
@@ -1467,8 +1469,7 @@ (defcustom mew-pick-default-field nil
   "*Default prefix string to be appeared when inputing a pick pattern.
 A good example is \"from=\"."
   :group 'mew-summary
-  :type '(choice string
-		 (const nil)))
+  :type '(choice string (const nil)))
 
 (defvar mew-pick-field-list
   '("head=" "to=" "cc=" "subject=" "dcc=" "fcc=" "bcc=" "date="
@@ -1545,7 +1546,7 @@ (defcustom mew-cursor-mark ">"
   "*The mark in the beginning of the cursor line if
 mew-use-cursor-mark is *non-nil*. "
   :group 'mew-highlight
-  :type 'string)
+  :type '(choice string (const nil)))
 
 (defcustom mew-use-cursor-mark nil
   "*If *non-nil*, show mew-cursor-mark in the beginning of the cursor line.
@@ -1888,7 +1889,7 @@ (defvar mew-x-face-args nil)
 (defcustom mew-x-face-file "~/.xface"
   "*If *non-nil* and the file exists, X-Face: fields is inserted."
   :group 'mew-summary
-  :type 'file)
+  :type '(choice file (const nil)))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;