Synch to No Gnus 200504221124.

[elisp/gnus.git-] / lisp / mail-source.el

diff --git a/lisp/mail-source.el b/lisp/mail-source.el
index a4d754b..6753c0d 100644 (file)
--- a/lisp/mail-source.el
+++ b/lisp/mail-source.el
@@ -234,7 +234,7 @@ See Info node `(gnus)Mail Source Specifiers'."
   "*Ignore errors when querying mail sources.
 If nil, the user will be prompted when an error occurs.  If non-nil,
 the error will be ignored."
-  :version "21.4"
+  :version "22.1"
   :group 'mail-source
   :type 'boolean)
 
@@ -282,7 +282,7 @@ files older than number of days."
   "*If non-nil, ask for for confirmation before deleting old incoming files.
 This variable only applies when `mail-source-delete-incoming' is a positive
 number."
-  :version "21.4"
+  :version "22.1"
   :group 'mail-source
   :type 'boolean)
 
@@ -303,7 +303,7 @@ number."
 
 (defcustom mail-source-movemail-program nil
   "If non-nil, name of program for fetching new mail."
-  :version "21.4"
+  :version "22.1"
   :group 'mail-source
   :type '(choice (const nil) string))
 
@@ -513,7 +513,7 @@ Return the number of files that were found."
                               (format "Mail source %s error (%s).  Continue? "
                                       (if (memq ':password source)
                                           (let ((s (copy-sequence source)))
-                                            (setcar (cdr (memq ':password s)) 
+                                            (setcar (cdr (memq ':password s))
                                                     "********")
                                             s)
                                         source)
@@ -874,7 +874,7 @@ See the Gnus manual for details."
 
 (eval-when-compile
   (if (featurep 'xemacs)
-      (require 'itimer)
+      (require 'timer-funcs)
     (require 'timer)))
 
 (defun mail-source-start-idle-timer ()