Misc changes made in Emacs trunk

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index eb7031f..fb9e5ac 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,15 @@
+2013-12-28  Glenn Morris  <rgm@gnu.org>
+
+       * 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  <larsi@gnus.org>
 
        * 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 (file)
--- 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 (file)
--- a/lisp/gnus-icalendar.el
+++ b/lisp/gnus-icalendar.el
@@ -1,6 +1,6 @@
 ;;; gnus-icalendar.el --- reply to iCalendar meeting requests
 
-;; Copyright (C) 2013  Free Software Foundation, Inc.
+;; Copyright (C) 2013 Free Software Foundation, Inc.
 
 ;; Author: Jan Tatarik <Jan.Tatarik@gmail.com>
 ;; Keywords: mail, icalendar, org
@@ -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 (file)
--- 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 (file)
--- 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 (file)
--- a/lisp/nnmairix.el
+++ b/lisp/nnmairix.el
@@ -308,13 +308,13 @@ The default chooses the largest window in the current frame."
 
 (defcustom nnmairix-propagate-marks-upon-close t
   "Flag if marks should be propagated upon closing a group.
-The default of this variable is t. If set to 'ask, the
+The default of this variable is t.  If set to 'ask, the
 user will be asked if the flags should be propagated when the
 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 (file)
--- a/lisp/tls.el
+++ b/lisp/tls.el
@@ -168,8 +168,8 @@ 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")
-  "Name of  GnuTLS certtool.
+(defcustom tls-certtool-program "certtool"
+  "Name of GnuTLS certtool.
 Used by `tls-certificate-information'."
   :version "22.1"
   :type 'string