From 7c662495ed6fa89a966bf6e4e555a05d07638c7f Mon Sep 17 00:00:00 2001
From: yamaoka <yamaoka>
Date: Fri, 26 Nov 2004 03:08:12 +0000
Subject: [PATCH] Synch to No Gnus 200411260307.

---
 lisp/ChangeLog        |   30 ++++++++++++++++++++++++++++++
 lisp/canlock.el       |    4 ++--
 lisp/deuglify.el      |    4 ++--
 lisp/gnus-art.el      |   10 +++++-----
 lisp/gnus-registry.el |    4 ++--
 lisp/gnus-score.el    |    2 +-
 lisp/gnus-start.el    |    2 +-
 lisp/gnus-sum.el      |    8 ++++----
 lisp/message.el       |   12 +++++-------
 lisp/pop3.el          |   10 +++++-----
 lisp/spam-report.el   |    2 +-
 lisp/spam.el          |    3 +--
 12 files changed, 59 insertions(+), 32 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0e7e060..527dde6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,33 @@
+2004-11-26  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* canlock.el (canlock-password): Remove `:size 0' or `:size 1'
+	which may confuse users.
+	(canlock-password-for-verify): Ditto.
+
+	* deuglify.el (gnus-outlook-deuglify-unwrap-stop-chars): Ditto.
+
+	* gnus-art.el (gnus-emphasis-alist): Ditto.
+
+	* gnus-registry.el (gnus-registry-max-entries): Ditto.
+
+	* gnus-score.el (gnus-adaptive-word-length-limit): Ditto.
+
+	* gnus-start.el (gnus-save-killed-list): Ditto.
+
+	* gnus-sum.el (gnus-thread-hide-subtree): Ditto.
+	(gnus-sum-thread-tree-root): Ditto.
+	(gnus-sum-thread-tree-false-root): Ditto.
+	(gnus-sum-thread-tree-single-indent): Ditto.
+
+	* message.el (message-courtesy-message): Ditto.
+	(message-archive-note): Ditto.
+	(message-subscribed-address-file): Ditto.
+	(message-user-fqdn): Ditto.
+
+	* spam-report.el (spam-report-gmane-regex): Ditto.
+
+	* spam.el (spam-blackhole-good-server-regex): Ditto.
+
 2004-11-25  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* mml.el (mml-preview): Widen the message buffer before copying
diff --git a/lisp/canlock.el b/lisp/canlock.el
index cb88eed..956800a 100644
--- a/lisp/canlock.el
+++ b/lisp/canlock.el
@@ -55,13 +55,13 @@
 (defcustom canlock-password nil
   "Password to use when signing a Cancel-Lock or a Cancel-Key header."
   :type '(radio (const :format "Not specified " nil)
-		(string :tag "Password" :size 0))
+		(string :tag "Password"))
   :group 'canlock)
 
 (defcustom canlock-password-for-verify canlock-password
   "Password to use when verifying a Cancel-Lock or a Cancel-Key header."
   :type '(radio (const :format "Not specified " nil)
-		(string :tag "Password" :size 0))
+		(string :tag "Password"))
   :group 'canlock)
 
 (defcustom canlock-force-insert-header nil
diff --git a/lisp/deuglify.el b/lisp/deuglify.el
index c33029f..fbae3b1 100644
--- a/lisp/deuglify.el
+++ b/lisp/deuglify.el
@@ -1,6 +1,6 @@
 ;;; deuglify.el --- deuglify broken Outlook (Express) articles
 
-;; Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
 ;; Copyright (C) 2001, 2002 Raymond Scholz
 
 ;; Author: Raymond Scholz <rscholz@zonix.de>
@@ -257,7 +257,7 @@
   "Characters that inhibit unwrapping if they are the last one on the cited line above the possible wrapped line."
   :version "21.4"
   :type '(radio (const :format "None  " nil)
-		(string :size 0 :value ".?!"))
+		(string :value ".?!"))
   :group 'gnus-outlook-deuglify)
 
 (defcustom gnus-outlook-deuglify-no-wrap-chars "`"
diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index bd613d1..46b78c9 100644
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -432,15 +432,15 @@ is the face used for highlighting."
 		     :value
 		     (gnus-emphasis-custom-value-to-external value))))
 	      (widget-group-value-create widget))
-	    (regexp :format "%t: %v\n" :size 1)
-	    (integer :format "Match group: %v\n" :size 0)
-	    (integer  :format "Emphasize group: %v\n" :size 0)
+	    regexp
+	    (integer :format "Match group: %v")
+	    (integer :format "Emphasize group: %v")
 	    face)
      (group :tag "Simple"
 	    :value (("_" . "_") nil default)
 	    (cons :format "%v"
-		  (regexp :format "Start regexp: %v\n" :size 0)
-		  (regexp :format "End regexp: %v\n" :size 0))
+		  (regexp :format "Start regexp: %v")
+		  (regexp :format "End regexp: %v"))
 	    (boolean :format "Show start and end patterns: %[%v%]\n"
 		     :on " On " :off " Off ")
 	    face)))
diff --git a/lisp/gnus-registry.el b/lisp/gnus-registry.el
index b232628..736db5d 100644
--- a/lisp/gnus-registry.el
+++ b/lisp/gnus-registry.el
@@ -1,5 +1,5 @@
 ;;; gnus-registry.el --- article registry for Gnus
-;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Ted Zlatanov <tzz@lifelogs.com>
@@ -134,7 +134,7 @@ way."
   "Maximum number of entries in the registry, nil for unlimited."
   :group 'gnus-registry
   :type '(radio (const :format "Unlimited " nil)
-		(integer :format "Maximum number: %v\n" :size 0)))
+		(integer :format "Maximum number: %v")))
 
 (defun gnus-registry-track-subject-p ()
   (memq 'subject gnus-registry-track-extra))
diff --git a/lisp/gnus-score.el b/lisp/gnus-score.el
index 18af8c3..3e38771 100644
--- a/lisp/gnus-score.el
+++ b/lisp/gnus-score.el
@@ -238,7 +238,7 @@ This variable allows the same syntax as `gnus-home-score-file'."
   :version "21.4"
   :group 'gnus-score-adapt
   :type '(radio (const :format "Unlimited " nil)
-		(integer :format "Maximum length: %v\n" :size 0)))
+		(integer :format "Maximum length: %v")))
 
 (defcustom gnus-ignored-adaptive-words nil
   "List of words to be ignored when doing adaptive word scoring."
diff --git a/lisp/gnus-start.el b/lisp/gnus-start.el
index c7a3d7c..c22c143 100644
--- a/lisp/gnus-start.el
+++ b/lisp/gnus-start.el
@@ -264,7 +264,7 @@ not match this regexp will be removed before saving the list."
 			       (and value (not (stringp value))))
 		      :value t)
 		(const nil)
-		(regexp :format "%t: %v\n" :size 0)))
+		regexp))
 
 (defcustom gnus-ignored-newsgroups
   (mapconcat 'identity
diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 9872347..d7c5bcc 100644
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -273,7 +273,7 @@ to expose hidden threads."
 			       (not (or (consp value) (functionp value))))
 		      :value t)
 		(const nil)
-		(sexp :tag "Predicate specifier" :size 0)))
+		(sexp :tag "Predicate specifier")))
 
 (defcustom gnus-thread-hide-killed t
   "*If non-nil, hide killed threads automatically."
@@ -4684,19 +4684,19 @@ Unscored articles will be counted as having a score of zero."
   "With %B spec, used for the root of a thread.
 If nil, use subject instead."
   :version "21.4"
-  :type '(radio (const :format "%v  " nil) (string :size 0))
+  :type '(radio (const :format "%v  " nil) string)
   :group 'gnus-thread)
 (defcustom gnus-sum-thread-tree-false-root "> "
   "With %B spec, used for a false root of a thread.
 If nil, use subject instead."
   :version "21.4"
-  :type '(radio (const :format "%v  " nil) (string :size 0))
+  :type '(radio (const :format "%v  " nil) string)
   :group 'gnus-thread)
 (defcustom gnus-sum-thread-tree-single-indent ""
   "With %B spec, used for a thread with just one message.
 If nil, use subject instead."
   :version "21.4"
-  :type '(radio (const :format "%v  " nil) (string :size 0))
+  :type '(radio (const :format "%v  " nil) string)
   :group 'gnus-thread)
 (defcustom gnus-sum-thread-tree-vertical "| "
   "With %B spec, used for drawing a vertical line."
diff --git a/lisp/message.el b/lisp/message.el
index b8de923..f2f2243 100644
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -170,7 +170,7 @@ If the string contains the format spec \"%s\", the Newsgroups
 the article has been posted to will be inserted there.
 If this variable is nil, no such courtesy message will be added."
   :group 'message-sending
-  :type '(radio (string :format "%t: %v\n" :size 0) (const nil)))
+  :type '(radio string (const nil)))
 
 (defcustom message-ignored-bounced-headers
   "^\\(Received\\|Return-Path\\|Delivered-To\\):"
@@ -266,8 +266,7 @@ Archives \(such as groups.google.com\) respect this header."
   "Note to insert why you wouldn't want this posting archived.
 If nil, don't insert any text in the body."
   :version "21.4"
-  :type '(radio (string :format "%t: %v\n" :size 0)
-		(const nil))
+  :type '(radio string (const nil))
   :link '(custom-manual "(message)Header Commands")
   :group 'message-various)
 
@@ -844,8 +843,7 @@ non-nil, each line of this file should be a mailing list address."
   :version "21.4"
   :group 'message-interface
   :link '(custom-manual "(message)Mailing Lists")
-  :type '(radio (file :format "%t: %v\n" :size 0)
-		(const nil)))
+  :type '(radio file (const nil)))
 
 (defcustom message-subscribed-addresses nil
   "*Specifies a list of addresses the user is subscribed to.
@@ -1653,7 +1651,7 @@ no, only reply back to the author."
   :group 'message-headers
   :link '(custom-manual "(message)News Headers")
   :type '(radio (const :format "%v  " nil)
-		(string :format "FQDN: %v\n" :size 0)))
+		(string :format "FQDN: %v")))
 
 (defcustom message-use-idna (and (condition-case nil (require 'idna)
 				   (file-error))
@@ -7405,7 +7403,7 @@ This variable is semi-obsolete, set it as nil and use
 		(function-item :format "eudc: %v\n" eudc-expand-inline)
 		(function-item :format "bbdb: %v\n" bbdb-complete-name)
 		(function-item :format "lsdb: %v\n" lsdb-complete-name)
-		(function :size 0 :value expand-abbrev)))
+		(function :value expand-abbrev)))
 
 (defcustom message-tab-body-function nil
   "*Function to execute when `message-tab' (TAB) is executed in the body.
diff --git a/lisp/pop3.el b/lisp/pop3.el
index 418da1f..833805c 100644
--- a/lisp/pop3.el
+++ b/lisp/pop3.el
@@ -150,18 +150,18 @@ Used for APOP authentication.")
 (defcustom pop3-maximum-message-size nil
   "If non-nil only download messages smaller than this."
   :type '(choice (const :tag "Unlimited" nil)
-		 (integer :tag "Maximum size" :format "%t: %v\n" :size 0))
+		 (integer :tag "Maximum size"))
   :group 'pop3)
 
 (defcustom pop3-except-header-regexp nil
   "If non-nil we do not retrieve messages whose headers are matching this regexp."
   :type '(choice (const :tag "Retrieve any messages" nil)
-		 (regexp :format "%t: %v\n" :size 0))
+		 (regexp :format "\n%t: %v"))
   :group 'pop3)
 
 (defcustom pop3-uidl-file-name "~/.uidls"
   "File in which to store the UIDL of processed messages."
-  :type '(file :format "%t: %v\n" :size 0)
+  :type 'file
   :group 'pop3)
 
 (defvar pop3-uidl-support nil
@@ -183,13 +183,13 @@ Users don't have to set this value.")
       "openssl"
     "ssleay")
   "The program to run in a subprocess to open an SSL connection."
-  :type '(string :format "%t: %v\n" :size 0)
+  :type 'string
   :group 'pop3)
 
 (defcustom pop3-ssl-program-arguments
   '("s_client" "-quiet")
   "Arguments to be passed to the program `pop3-ssl-program-name'."
-  :type '(repeat (string :format "%v\n" :size 0))
+  :type '(repeat (string :format "%v"))
   :group 'pop3)
 
 (defun pop3-progress-message (format percent &rest args)
diff --git a/lisp/spam-report.el b/lisp/spam-report.el
index 97255f7..dcd9557 100644
--- a/lisp/spam-report.el
+++ b/lisp/spam-report.el
@@ -43,7 +43,7 @@ If you are using spam.el, consider setting gnus-spam-process-newsgroups
 or the gnus-group-spam-exit-processor-report-gmane group/topic parameter
 instead."
   :type '(radio (const nil)
-		(regexp :format "%t: %v\n" :size 0 :value "^nntp\+.*:gmane\."))
+		(regexp :value "^nntp\+.*:gmane\."))
   :group 'spam-report)
 
 (defcustom spam-report-gmane-spam-header
diff --git a/lisp/spam.el b/lisp/spam.el
index 946f715..a4f6f2d 100644
--- a/lisp/spam.el
+++ b/lisp/spam.el
@@ -347,8 +347,7 @@ Only meaningful if you enable `spam-use-blackholes'."
 (defcustom spam-blackhole-good-server-regex nil
   "String matching IP addresses that should not be checked in the blackholes.
 Only meaningful if you enable `spam-use-blackholes'."
-  :type '(radio (const nil)
-		(regexp :format "%t: %v\n" :size 0))
+  :type '(radio (const nil) regexp)
   :group 'spam)
 
 (defcustom spam-face 'gnus-splash-face
-- 
1.7.10.4