From 3cf1618f34957ba08d8f91bdd552f9408d1d7a0f Mon Sep 17 00:00:00 2001 From: yamaoka Date: Thu, 7 Aug 2003 01:57:30 +0000 Subject: [PATCH] Synch to Gnus 200308070200. --- lisp/ChangeLog | 23 +++++++++++++++++++++++ lisp/canlock.el | 6 ++++-- lisp/deuglify.el | 7 ++++--- lisp/gnus-art.el | 6 ++++-- lisp/gnus-start.el | 2 +- lisp/gnus-sum.el | 6 +++--- lisp/message.el | 11 +++++++---- 7 files changed, 46 insertions(+), 15 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index cbe1744..28d1f20 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,28 @@ 2003-08-07 Katsumi Yamaoka + * canlock.el (canlock-password): Fix customization type. + (canlock-password-for-verify): Ditto. + * deuglify.el (gnus-outlook-deuglify-unwrap-min): Ditto. + (gnus-outlook-deuglify-unwrap-max): Ditto. + (gnus-outlook-deuglify-unwrap-stop-chars): Ditto. + * gnus-sum.el (gnus-sum-thread-tree-root): Ditto. + (gnus-sum-thread-tree-false-root): Ditto. + (gnus-sum-thread-tree-single-indent): Ditto. + * message.el (message-archive-note): Ditto. + (message-subscribed-address-file): Ditto. + (message-user-fqdn): Ditto. + + * gnus-start.el (gnus-save-killed-list): Fix last change. + * message.el (message-courtesy-message): Ditto. + +2003-08-07 Jesper Harder + + * gnus-art.el (gnus-header-face-alist): Revert previous change. + (gnus-header-newsgroups-face): Explain that it's only used for + crossposts. + +2003-08-07 Katsumi Yamaoka + * gnus-registry.el (gnus-registry-max-entries): Fix customization type. * gnus-score.el (gnus-adaptive-word-length-limit): Ditto. diff --git a/lisp/canlock.el b/lisp/canlock.el index ee97fd3..55b2e59 100644 --- a/lisp/canlock.el +++ b/lisp/canlock.el @@ -83,12 +83,14 @@ (defcustom canlock-password nil "Password to use when signing a Cancel-Lock or a Cancel-Key header." - :type 'string + :type '(radio (const :format "Not specified " nil) + (string :tag "Password" :size 0)) :group 'canlock) (defcustom canlock-password-for-verify canlock-password "Password to use when verifying a Cancel-Lock or a Cancel-Key header." - :type 'string + :type '(radio (const :format "Not specified " nil) + (string :tag "Password" :size 0)) :group 'canlock) (defcustom canlock-force-insert-header nil diff --git a/lisp/deuglify.el b/lisp/deuglify.el index a73d7f0..ef10ac4 100644 --- a/lisp/deuglify.el +++ b/lisp/deuglify.el @@ -235,13 +235,13 @@ ;;;###autoload (defcustom gnus-outlook-deuglify-unwrap-min 45 "Minimum length of the cited line above the (possibly) wrapped line." - :type 'number + :type 'integer :group 'gnus-outlook-deuglify) ;;;###autoload (defcustom gnus-outlook-deuglify-unwrap-max 95 "Maximum length of the cited line after unwrapping." - :type 'number + :type 'integer :group 'gnus-outlook-deuglify) (defcustom gnus-outlook-deuglify-cite-marks ">|#%" @@ -251,7 +251,8 @@ (defcustom gnus-outlook-deuglify-unwrap-stop-chars nil ;; ".?!" or nil "Characters that inhibit unwrapping if they are the last one on the cited line above the possible wrapped line." - :type 'string + :type '(radio (const :format "None " nil) + (string :size 0 :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 32534d6..1103eea 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -680,7 +680,9 @@ Obsolete; use the face `gnus-signature-face' for customizations instead." (:foreground "MidnightBlue" :italic t)) (t (:italic t))) - "Face used for displaying newsgroups headers." + "Face used for displaying newsgroups headers. +In the default setup this face is only used for crossposted +articles." :group 'gnus-article-headers :group 'gnus-article-highlight) @@ -713,7 +715,7 @@ Obsolete; use the face `gnus-signature-face' for customizations instead." (defcustom gnus-header-face-alist '(("From" nil gnus-header-from-face) ("Subject" nil gnus-header-subject-face) - ("Newsgroups" nil gnus-header-newsgroups-face) + ("Newsgroups:.*," nil gnus-header-newsgroups-face) ("" gnus-header-name-face gnus-header-content-face)) "*Controls highlighting of article headers. diff --git a/lisp/gnus-start.el b/lisp/gnus-start.el index 22ace2b..0c06267 100644 --- a/lisp/gnus-start.el +++ b/lisp/gnus-start.el @@ -255,7 +255,7 @@ not match this regexp will be removed before saving the list." (and value (not (stringp value)))) :value t) (const nil) - (regexp :size 0))) + (regexp :format "%t: %v\n" :size 0))) (defcustom gnus-ignored-newsgroups (mapconcat 'identity diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el index 3967d55..0123833 100644 --- a/lisp/gnus-sum.el +++ b/lisp/gnus-sum.el @@ -4574,17 +4574,17 @@ Unscored articles will be counted as having a score of zero." (defcustom gnus-sum-thread-tree-root "> " "With %B spec, used for the root of a thread. If nil, use subject instead." - :type 'string + :type '(radio (const :format "%v " nil) (string :size 0)) :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." - :type 'string + :type '(radio (const :format "%v " nil) (string :size 0)) :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." - :type 'string + :type '(radio (const :format "%v " nil) (string :size 0)) :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 03f3f0a..60462f3 100644 --- a/lisp/message.el +++ b/lisp/message.el @@ -178,7 +178,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 (const nil) (string :size 0))) + :type '(radio (string :format "%t: %v\n" :size 0) (const nil))) (defcustom message-ignored-bounced-headers "^\\(Received\\|Return-Path\\|Delivered-To\\):" @@ -262,7 +262,8 @@ Archives \(such as groups.google.com\) respect this header." "X-No-Archive: Yes - save http://groups.google.com/" "Note to insert why you wouldn't want this posting archived. If nil, don't insert any text in the body." - :type 'string + :type '(radio (string :format "%t: %v\n" :size 0) + (const nil)) :group 'message-various) ;;; Crossposts and Followups @@ -771,7 +772,8 @@ conjunction with `message-subscribed-regexps' and If nil, do not look at any files to determine list subscriptions. If non-nil, each line of this file should be a mailing list address." :group 'message-interface - :type 'string) + :type '(radio (file :format "%t: %v\n" :size 0) + (const nil))) (defcustom message-subscribed-addresses nil "*Specifies a list of addresses the user is subscribed to. @@ -1527,7 +1529,8 @@ no, only reply back to the author." "*Domain part of Messsage-Ids." :group 'message-headers :link '(custom-manual "(message)News Headers") - :type 'string) + :type '(radio (const :format "%v " nil) + (string :format "FQDN: %v\n" :size 0))) (defcustom message-use-idna (and (condition-case nil (require 'idna) (file-error)) -- 1.7.10.4