Merge changes made in Emacs trunk

epa.texi (Encrypting/decrypting gpg files):
  Rename nodes to avoid characters that can cause Texinfo problems.
gnus-icalendar.el (gnus-icalendar-org-capture-file): Fix type.
gnus.el (gnus-valid-select-methods): Fix type.
nnimap.el (nnimap-request-articles-find-limit): Fix type, version.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 28eac15..d26a2cb 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2013-08-13  Glenn Morris  <rgm@gnu.org>
+
+       * gnus-icalendar.el (gnus-icalendar-org-capture-file): Fix type.
+
+       * gnus.el (gnus-valid-select-methods): Fix type.
+
+       * nnimap.el (nnimap-request-articles-find-limit): Fix type, version.
+
 2013-08-12  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * mm-decode.el (mm-display-external): Run a timer for the temp files

diff --git a/lisp/gnus-icalendar.el b/lisp/gnus-icalendar.el
index 3a9e743..a946a58 100644 (file)
--- a/lisp/gnus-icalendar.el
+++ b/lisp/gnus-icalendar.el
@@ -323,7 +323,7 @@ on the IDENTITIES list."
 
 (defcustom gnus-icalendar-org-capture-file nil
   "Target Org file for storing captured calendar events."
-  :type 'file
+  :type '(choice (const nil) file)
   :group 'gnus-icalendar-org)
 
 (defcustom gnus-icalendar-org-capture-headline nil

diff --git a/lisp/gnus.el b/lisp/gnus.el
index 737accd..ebdcc45 100644 (file)
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -1649,6 +1649,7 @@ this variable.  I think."
                                             (const post-mail))
                        (checklist :inline t :greedy t
                                   (const :format "%v " address)
+                                  (const global)
                                   (const :format "%v " prompt-address)
                                   (const :format "%v " physical-address)
                                   (const virtual)

diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index 4d9320b..f8c2b24 100644 (file)
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -130,8 +130,8 @@ textual parts.")
 
 (defcustom nnimap-request-articles-find-limit nil
   "Limit the number of articles to look for after moving an article."
-  :type 'integer
-  :version "24.3"
+  :type '(choice (const nil) integer)
+  :version "24.4"
   :group 'nnimap)
 
 (defvar nnimap-process nil)

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 3b6422d..a1ff118 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,8 @@
+2013-08-13  Glenn Morris  <rgm@gnu.org>
+
+       * epa.texi (Encrypting/decrypting gpg files):
+       Rename nodes to avoid characters that can cause Texinfo problems.
+
 2013-08-12  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus.texi (Mail Source Specifiers): Fix description for pop3's :leave.

diff --git a/texi/epa.texi b/texi/epa.texi
index 6a0d310..7432ac7 100644 (file)
--- a/texi/epa.texi
+++ b/texi/epa.texi
@@ -106,7 +106,7 @@ This chapter introduces various commands for typical use cases.
 * Cryptographic operations on files::
 * Dired integration::
 * Mail-mode integration::
-* Encrypting/decrypting *.gpg files::
+* Encrypting/decrypting gpg files::
 @end menu
 
 @node Key management
@@ -346,8 +346,8 @@ key in the recipient list, use @samp{encrypt-to} option in
 
 @end table
 
-@node Encrypting/decrypting *.gpg files
-@section Encrypting/decrypting *.gpg files
+@node Encrypting/decrypting gpg files
+@section Encrypting/decrypting gpg files
 By default, every file whose name ends with @samp{.gpg} will be
 treated as encrypted.  That is, when you open such a file, the
 decrypted text is inserted in the buffer rather than encrypted one.
@@ -464,7 +464,7 @@ To set up gpg-agent, follow the instruction in GnuPG manual.
 
 To set up elisp passphrase cache, set
 @code{epa-file-cache-passphrase-for-symmetric-encryption}.
-@xref{Encrypting/decrypting *.gpg files}.
+@xref{Encrypting/decrypting gpg files}.
 
 @node Bug Reports
 @chapter Bug Reports