merge from trunk

6 files changed, 17 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0c0c3911cfd..7951188bbaf 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2013-08-13  Glenn Morris  <rgm@gnu.org>
+
+        * net/shr.el (shr-table-horizontal-line): Fix custom type.
+
 2013-08-13  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * emacs-lisp/timer.el (timer--time-setter): New function.
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 4fcf078e9d6..bc56d942191 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/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/gnus-icalendar.el b/lisp/gnus/gnus-icalendar.el
index 3a9e743e8ed..a946a586033 100644
--- a/lisp/gnus/gnus-icalendar.el
+++ b/lisp/gnus/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/gnus.el b/lisp/gnus/gnus.el
index 409b1cc6255..266ee0fe7cb 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/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/gnus/nnimap.el b/lisp/gnus/nnimap.el
index 4d9320b995f..f8c2b24cc9f 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/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/lisp/net/shr.el b/lisp/net/shr.el
index 7eda2554e06..bc454292360 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -59,7 +59,7 @@ fit these criteria."
   "Character used to draw horizontal table lines.
 If nil, don't draw horizontal table lines."
   :group 'shr
-  :type 'character)
+  :type '(choice (const nil) character))
 
 (defcustom shr-table-vertical-line ?\s
   "Character used to draw vertical table lines."