[gnus git] branch master updated: m0-7-10-gcae8ffc =1= Fix a bunch of custom types, and more
Katsumi Yamaoka <[email protected]>
| Newsgroups | gmane.emacs.gnus.cvs |
|---|---|
| Message-ID | <[email protected]> |
via cae8ffc46d8446accf3c5d10ded0bc5c845da474 (commit)
from d8f3afde92c00250e3e8ab94cb7f70336f159525 (commit)
- Log -----------------------------------------------------------------
commit cae8ffc46d8446accf3c5d10ded0bc5c845da474
Author: Glenn Morris <[email protected]>
Date: Thu May 9 22:29:11 2013 +0000
Fix a bunch of custom types, and more
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3c98f80..4b3b8bb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,26 @@
+2013-05-09 Glenn Morris <[email protected]>
+
+ * mml1991.el: Make it loadable. (Bug#13456)
+
+ * gnus-art.el (gnus-article-date-headers, gnus-blocked-images):
+ * gnus-async.el (gnus-async-post-fetch-function):
+ * gnus-gravatar.el (gnus-gravatar-size, gnus-gravatar-properties):
+ * gnus-html.el (gnus-html-image-cache-ttl):
+ * gnus-notifications.el (gnus-notifications-timeout):
+ * gnus-picon.el (gnus-picon-properties):
+ * gnus-util.el (gnus-completion-styles):
+ * gnus.el (gnus-other-frame-resume-function):
+ * message.el (message-user-organization-file)
+ (message-cite-reply-position):
+ * nnir.el (nnir-summary-line-format)
+ (nnir-retrieve-headers-override-function):
+ * shr-color.el (shr-color-visible-luminance-min):
+ * shr.el (shr-blocked-images):
+ * spam-report.el (spam-report-resend-to):
+ * spam.el (spam-summary-exit-behavior): Fix custom types.
+
+ * gnus-salt.el (gnus-selected-tree-face): Fix default.
+
2013-05-07 Katsumi Yamaoka <[email protected]>
* gnus-art.el (gnus-article-describe-bindings): Require help-mode
diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 64598b1..d76d37a 100644
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -1033,15 +1033,15 @@ Some of these headers are updated automatically. See
`gnus-article-update-date-headers' for details."
:version "24.1"
:group 'gnus-article-headers
- :type '(repeat
- (item :tag "Universal time (UT)" :value 'ut)
- (item :tag "Local time zone" :value 'local)
- (item :tag "Readable English" :value 'english)
- (item :tag "Elapsed time" :value 'lapsed)
- (item :tag "Original and elapsed time" :value 'combined-lapsed)
- (item :tag "Original date header" :value 'original)
- (item :tag "ISO8601 format" :value 'iso8601)
- (item :tag "User-defined" :value 'user-defined)))
+ :type '(set
+ (const :tag "Universal time (UT)" ut)
+ (const :tag "Local time zone" local)
+ (const :tag "Readable English" english)
+ (const :tag "Elapsed time" lapsed)
+ (const :tag "Original and elapsed time" combined-lapsed)
+ (const :tag "Original date header" original)
+ (const :tag "ISO8601 format" iso8601)
+ (const :tag "User-defined" user-defined)))
(defcustom gnus-article-update-date-headers nil
"A number that says how often to update the date header (in seconds).
@@ -1652,7 +1652,7 @@ called with the group name as the parameter, and should return a
regexp."
:version "24.1"
:group 'gnus-art
- :type 'regexp)
+ :type '(choice regexp function))
;;; Internal variables
diff --git a/lisp/gnus-async.el b/lisp/gnus-async.el
index c5d6433..d0afd1a 100644
--- a/lisp/gnus-async.el
+++ b/lisp/gnus-async.el
@@ -76,7 +76,7 @@ The function will be called narrowed to the region of the article
that was fetched."
:version "24.1"
:group 'gnus-asynchronous
- :type 'function)
+ :type '(choice (const nil) function))
;;; Internal variables.
diff --git a/lisp/gnus-gravatar.el b/lisp/gnus-gravatar.el
index 8b9c49a..33bcb6b 100644
--- a/lisp/gnus-gravatar.el
+++ b/lisp/gnus-gravatar.el
@@ -35,13 +35,13 @@
(defcustom gnus-gravatar-size nil
"How big should gravatars be displayed.
If nil, default to `gravatar-size'."
- :type 'integer
+ :type '(choice (const nil) integer)
:version "24.1"
:group 'gnus-gravatar)
(defcustom gnus-gravatar-properties '(:ascent center :relief 1)
"List of image properties applied to Gravatar images."
- :type 'list
+ :type 'sexp
:version "24.1"
:group 'gnus-gravatar)
diff --git a/lisp/gnus-html.el b/lisp/gnus-html.el
index bdf03a1..a5625df 100644
--- a/lisp/gnus-html.el
+++ b/lisp/gnus-html.el
@@ -45,7 +45,10 @@
"Time used to determine if we should use images from the cache."
:version "24.1"
:group 'gnus-art
- :type 'integer)
+ ;; FIXME hardly the friendliest type. The allowed value is actually
+ ;; any time value, but we are assuming no-one cares about USEC and
+ ;; PSEC here. It would be better to eg make it a number of minutes.
+ :type '(list integer integer))
(defcustom gnus-html-image-automatic-caching t
"Whether automatically cache retrieve images."
diff --git a/lisp/gnus-notifications.el b/lisp/gnus-notifications.el
index 224b59b..f29bdb7 100644
--- a/lisp/gnus-notifications.el
+++ b/lisp/gnus-notifications.el
@@ -64,7 +64,8 @@ not get notifications."
(defcustom gnus-notifications-timeout nil
"Timeout used for notifications sent via `notifications-notify'."
- :type 'integer
+ :type '(choice (const :tag "Server default" nil)
+ (integer :tag "Milliseconds"))
:group 'gnus-notifications)
(defvar gnus-notifications-sent nil
diff --git a/lisp/gnus-picon.el b/lisp/gnus-picon.el
index 4f28f8e..5402982 100644
--- a/lisp/gnus-picon.el
+++ b/lisp/gnus-picon.el
@@ -77,7 +77,7 @@ Some people may want to add \"unknown\" to this list."
(defcustom gnus-picon-properties '(:color-symbols (("None" . "white")))
"List of image properties applied to picons."
- :type 'list
+ :type 'sexp
:version "24.3"
:group 'gnus-picon)
diff --git a/lisp/gnus-salt.el b/lisp/gnus-salt.el
index 48b51d2..6b8e105 100644
--- a/lisp/gnus-salt.el
+++ b/lisp/gnus-salt.el
@@ -385,7 +385,7 @@ lines."
integer)
:group 'gnus-summary-tree)
-(defcustom gnus-selected-tree-face 'modeline
+(defcustom gnus-selected-tree-face 'mode-line
"*Face used for highlighting selected articles in the thread tree."
:type 'face
:group 'gnus-summary-tree)
diff --git a/lisp/gnus-util.el b/lisp/gnus-util.el
index a121c27..6e2c586 100644
--- a/lisp/gnus-util.el
+++ b/lisp/gnus-util.el
@@ -68,7 +68,7 @@
"Value of `completion-styles' to use when completing."
:version "24.1"
:group 'gnus-meta
- :type 'list)
+ :type '(repeat symbol))
;; Fixme: this should be a gnus variable, not nnmail-.
(defvar nnmail-pathname-coding-system)
diff --git a/lisp/gnus.el b/lisp/gnus.el
index eb2531b..c79b1e0 100644
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -2507,6 +2507,7 @@ Disabling the agent may result in noticeable loss of performance."
:version "24.4"
:group 'gnus-start
:type '(choice (function-item gnus)
+ (function-item gnus-group-get-new-news)
(function-item gnus-no-server)
(function-item gnus-slave)
(function-item gnus-slave-no-server)))
diff --git a/lisp/message.el b/lisp/message.el
index d87879b..f867938 100644
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -535,7 +535,7 @@ If t, use `message-user-organization-file'."
(setq orgfile f)))
orgfile)
"*Local news organization file."
- :type 'file
+ :type '(choice (const nil) file)
:link '(custom-manual "(message)News Headers")
:group 'message-headers)
@@ -1142,9 +1142,9 @@ e.g. using `gnus-posting-styles':
(eval (set (make-local-variable 'message-cite-reply-position) 'above))"
:version "24.1"
- :type '(choice (const :tag "Reply inline" 'traditional)
- (const :tag "Reply above" 'above)
- (const :tag "Reply below" 'below))
+ :type '(choice (const :tag "Reply inline" traditional)
+ (const :tag "Reply above" above)
+ (const :tag "Reply below" below))
:group 'message-insertion)
(defcustom message-cite-style nil
diff --git a/lisp/mml1991.el b/lisp/mml1991.el
index 5af7639..52b8e34 100644
--- a/lisp/mml1991.el
+++ b/lisp/mml1991.el
@@ -50,6 +50,8 @@
(autoload 'message-options-get "message")
(autoload 'message-options-set "message")
+(require 'mml2015)
+
(defvar mml1991-use mml2015-use
"The package used for PGP.")
diff --git a/lisp/mml2015.el b/lisp/mml2015.el
index 4d2647f..c3905b8 100644
--- a/lisp/mml2015.el
+++ b/lisp/mml2015.el
@@ -47,6 +47,9 @@
(config &optional minimum-version))
(declare-function epg-configuration "ext:epg-config" ())
+;; Maybe this should be in eg mml-sec.el (and have a different name).
+;; Then mml1991 would not need to require mml2015, and mml1991-use
+;; could be removed.
(defvar mml2015-use (or
(condition-case nil
(progn
diff --git a/lisp/nnir.el b/lisp/nnir.el
index aba07cf..22dee30 100644
--- a/lisp/nnir.el
+++ b/lisp/nnir.el
@@ -326,7 +326,7 @@ with three items unique to nnir summary buffers:
If nil this will use `gnus-summary-line-format'."
:version "24.1"
- :type '(string)
+ :type '(choice (const :tag "gnus-summary-line-format" nil) string)
:group 'nnir)
(defcustom nnir-retrieve-headers-override-function nil
@@ -338,7 +338,7 @@ retrieved header format.
If this variable is nil, or if the provided function returns nil for a search
result, `gnus-retrieve-headers' will be called instead."
:version "24.1"
- :type '(function)
+ :type '(choice (const :tag "gnus-retrieve-headers" nil) function)
:group 'nnir)
(defcustom nnir-imap-default-search-key "whole message"
diff --git a/lisp/shr-color.el b/lisp/shr-color.el
index 91b2cf7..0b320a2 100644
--- a/lisp/shr-color.el
+++ b/lisp/shr-color.el
@@ -37,7 +37,7 @@
"Minimum luminance distance between two colors to be considered visible.
Must be between 0 and 100."
:group 'shr
- :type 'float)
+ :type 'number)
(defcustom shr-color-visible-distance-min 5
"Minimum color distance between two colors to be considered visible.
diff --git a/lisp/shr.el b/lisp/shr.el
index 293ba24..5c1b99e 100644
--- a/lisp/shr.el
+++ b/lisp/shr.el
@@ -52,7 +52,7 @@ fit these criteria."
"Images that have URLs matching this regexp will be blocked."
:version "24.1"
:group 'shr
- :type 'regexp)
+ :type '(choice (const nil) regexp))
(defcustom shr-table-horizontal-line ?\s
"Character used to draw horizontal table lines."
diff --git a/lisp/spam-report.el b/lisp/spam-report.el
index 06aae29..24e1ca7 100644
--- a/lisp/spam-report.el
+++ b/lisp/spam-report.el
@@ -81,7 +81,7 @@ The function must accept the arguments `host' and `report'."
"Email address that spam articles are resent to when reporting.
If not set, the user will be prompted to enter a value which will be
saved for future use."
- :type 'string
+ :type '(choice (const :tag "Prompt" nil) string)
:group 'spam-report)
(defvar spam-report-url-ping-temp-agent-function nil
diff --git a/lisp/spam.el b/lisp/spam.el
index 063ba28..725017c 100644
--- a/lisp/spam.el
+++ b/lisp/spam.el
@@ -94,14 +94,14 @@ Note that setting the `spam-use-move' or `spam-use-copy' backends on
a group through group/topic parameters overrides this mechanism."
:type '(choice
(const
- 'default
- :tag "Move spam out of all groups and ham out of spam groups.")
+ :tag "Move spam out of all groups and ham out of spam groups"
+ default)
(const
- 'move-all
- :tag "Move spam out of all groups and ham out of all groups.")
+ :tag "Move spam out of all groups and ham out of all groups"
+ move-all)
(const
- 'move-none
- :tag "Never move spam or ham out of any groups."))
+ :tag "Never move spam or ham out of any groups"
+ move-none))
:group 'spam)
(defcustom spam-directory (nnheader-concat gnus-directory "spam/")
-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.
Summary of changes:
lisp/ChangeLog | 23 +++++++++++++++++++++++
lisp/gnus-art.el | 20 ++++++++++----------
lisp/gnus-async.el | 2 +-
lisp/gnus-gravatar.el | 4 ++--
lisp/gnus-html.el | 5 ++++-
lisp/gnus-notifications.el | 3 ++-
lisp/gnus-picon.el | 2 +-
lisp/gnus-salt.el | 2 +-
lisp/gnus-util.el | 2 +-
lisp/gnus.el | 1 +
lisp/message.el | 8 ++++----
lisp/mml1991.el | 2 ++
lisp/mml2015.el | 3 +++
lisp/nnir.el | 4 ++--
lisp/shr-color.el | 2 +-
lisp/shr.el | 2 +-
lisp/spam-report.el | 2 +-
lisp/spam.el | 12 ++++++------
18 files changed, 66 insertions(+), 33 deletions(-)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".
The branch, master has been updated
hooks/post-receive
--
Gnus Project