[gnus git] branch master updated: m0-7-276-gc32ff41 =1= Misc changes made in Emacs trunk
Katsumi Yamaoka <[email protected]>
| Newsgroups | gmane.emacs.gnus.cvs |
|---|---|
| Message-ID | <[email protected]> |
via c32ff41cd6ce14db705ec39432819776d4be86a6 (commit)
from 934f25f8d8801afe315722fd0b0b4ea14bcb1534 (commit)
- Log -----------------------------------------------------------------
commit c32ff41cd6ce14db705ec39432819776d4be86a6
Author: Glenn Morris <[email protected]>
Date: Sat Dec 28 03:12:13 2013 +0000
Misc changes made in Emacs trunk
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index eb7031f..fb9e5ac 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,15 @@
+2013-12-28 Glenn Morris <[email protected]>
+
+ * gnus-icalendar.el (gnus-icalendar-org, gnus-icalendar):
+ * gnus-sum.el (gnus-subthread-sort-functions): Add version.
+ * gnus-sync.el (gnus-sync-file-encrypt-to): Add type and version.
+
+ * auth-source.el (auth-sources):
+ * nnmairix.el (nnmairix-propagate-marks-upon-close):
+ Fix custom types.
+
+ * tls.el (tls-certtool-program): Fix default value.
+
2013-12-26 Lars Ingebrigtsen <[email protected]>
* gnus-sum.el (gnus-summary-respool-query): Special-case nnimap so that
diff --git a/lisp/auth-source.el b/lisp/auth-source.el
index e43ab16..1b04fba 100644
--- a/lisp/auth-source.el
+++ b/lisp/auth-source.el
@@ -261,7 +261,7 @@ can get pretty complex."
:type `(repeat :tag "Authentication Sources"
(choice
(string :tag "Just a file")
- (const :tag "Default Secrets API Collection" 'default)
+ (const :tag "Default Secrets API Collection" default)
(const :tag "Login Secrets API Collection" "secrets:Login")
(const :tag "Temp Secrets API Collection" "secrets:session")
@@ -280,7 +280,7 @@ can get pretty complex."
(const :format "" :value :secrets)
(choice :tag "Collection to use"
(string :tag "Collection name")
- (const :tag "Default" 'default)
+ (const :tag "Default" default)
(const :tag "Login" "Login")
(const
:tag "Temporary" "session")))
@@ -290,14 +290,14 @@ can get pretty complex."
:value :macos-keychain-internet)
(choice :tag "Collection to use"
(string :tag "internet Keychain path")
- (const :tag "default" 'default)))
+ (const :tag "default" default)))
(list
:tag "Mac OS generic Keychain"
(const :format ""
:value :macos-keychain-generic)
(choice :tag "Collection to use"
(string :tag "generic Keychain path")
- (const :tag "default" 'default))))
+ (const :tag "default" default))))
(repeat :tag "Extra Parameters" :inline t
(choice :tag "Extra parameter"
(list
diff --git a/lisp/gnus-icalendar.el b/lisp/gnus-icalendar.el
index 1abcb6e..4ceec60 100644
--- a/lisp/gnus-icalendar.el
+++ b/lisp/gnus-icalendar.el
@@ -344,6 +344,7 @@ on the IDENTITIES list."
(defgroup gnus-icalendar-org nil
"Settings for Calendar Event gnus/org integration."
+ :version "24.4"
:group 'gnus-icalendar
:prefix "gnus-icalendar-org-")
@@ -644,6 +645,7 @@ is searched."
(defgroup gnus-icalendar nil
"Settings for inline display of iCalendar invitations."
+ :version "24.4"
:group 'gnus-article
:prefix "gnus-icalendar-")
diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 49e5aa7..f6caf8a 100644
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -897,6 +897,7 @@ subthreads, customize `gnus-subthread-sort-functions'."
"*List of functions used for sorting subthreads in the summary buffer.
By default, subthreads are sorted the same as threads, i.e.,
according to the value of `gnus-thread-sort-functions'."
+ :version "24.4"
:group 'gnus-summary-sort
:type '(choice
(const :tag "Sort subthreads like threads" gnus-thread-sort-functions)
diff --git a/lisp/gnus-sync.el b/lisp/gnus-sync.el
index d4050ad..249df0f 100644
--- a/lisp/gnus-sync.el
+++ b/lisp/gnus-sync.el
@@ -151,8 +151,9 @@ and `gnus-topic-alist'. Also see `gnus-variable-list'."
"Carrier for newsrc data")
(defcustom gnus-sync-file-encrypt-to nil
- "If non-nil, `epa-file-encrypt-to' is set from this for encrypting the Sync
- file."
+ "If non-nil, set `epa-file-encrypt-to' from this for encrypting the Sync file."
+ :version "24.4"
+ :type '(choice string (repeat string))
:group 'gnus-sync)
(defcustom gnus-sync-lesync-name (system-name)
diff --git a/lisp/nnmairix.el b/lisp/nnmairix.el
index 8c73b40..536028a 100644
--- a/lisp/nnmairix.el
+++ b/lisp/nnmairix.el
@@ -314,7 +314,7 @@ group is closed. If set to nil, the user will have to manually
call 'nnmairix-propagate-marks'."
:version "23.1"
:type '(choice (const :tag "always" t)
- (const :tag "ask" 'ask)
+ (const :tag "ask" ask)
(const :tag "never" nil))
:group 'nnmairix)
diff --git a/lisp/tls.el b/lisp/tls.el
index 3d8d8de..540116d 100644
--- a/lisp/tls.el
+++ b/lisp/tls.el
@@ -168,7 +168,7 @@ this to nil if you want to ignore host name mismatches."
:version "23.1" ;; No Gnus
:group 'tls)
-(defcustom tls-certtool-program (executable-find "certtool")
+(defcustom tls-certtool-program "certtool"
"Name of GnuTLS certtool.
Used by `tls-certificate-information'."
:version "22.1"
-----------------------------------------------------------------------
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 | 12 ++++++++++++
lisp/auth-source.el | 8 ++++----
lisp/gnus-icalendar.el | 4 +++-
lisp/gnus-sum.el | 1 +
lisp/gnus-sync.el | 5 +++--
lisp/nnmairix.el | 4 ++--
lisp/tls.el | 4 ++--
7 files changed, 27 insertions(+), 11 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