2000-10-03 Dave Love <fx@gnu.org>

	* mail-source.el (mail-sources): Revert to nil.

2000-10-03  ShengHuo ZHU  <zsh@cs.rochester.edu>

	* mail-source.el (mail-source-report-new-mail): Use
	nnheader-cancel-timer.

2000-10-03  Simon Josefsson  <simon@josefsson.org>

	* mail-source.el (mail-source-imap-file-coding-system): New variable.
	(mail-source-fetch-imap): Use it.

diff --git a/lisp/gnus/mail-source.el b/lisp/gnus/mail-source.el
index 0f721adf5eaf7ab87fd0845d99f3faf7ce6d2e70..1702ca2b7bc8cc85c33dec54748c99e14515eb71 100644 (file)
--- a/lisp/gnus/mail-source.el
+++ b/lisp/gnus/mail-source.el
@@ -36,7 +36,7 @@
   :version "21.1"
   :group 'gnus)
 
-(defcustom mail-sources '((file))
+(defcustom mail-sources nil
   "*Where the mail backends will look for incoming mail.
 This variable is a list of mail source specifiers.
 See Info node `(gnus)Mail Source Specifiers'."
@@ -719,9 +719,9 @@ This only works when `display-time' is enabled."
              (> (prefix-numeric-value arg) 0))))
     (setq mail-source-report-new-mail on)
     (and mail-source-report-new-mail-timer
-        (cancel-timer mail-source-report-new-mail-timer))
+        (nnheader-cancel-timer mail-source-report-new-mail-timer))
     (and mail-source-report-new-mail-idle-timer
-        (cancel-timer mail-source-report-new-mail-idle-timer))
+        (nnheader-cancel-timer mail-source-report-new-mail-idle-timer))
     (setq mail-source-report-new-mail-timer nil)
     (setq mail-source-report-new-mail-idle-timer nil)
     (if on
@@ -789,8 +789,12 @@ This only works when `display-time' is enabled."
   (autoload 'imap-error-text "imap")
   (autoload 'imap-message-flags-add "imap")
   (autoload 'imap-list-to-message-set "imap")
+  (autoload 'imap-range-to-message-set "imap")
   (autoload 'nnheader-ms-strip-cr "nnheader"))
 
+(defvar mail-source-imap-file-coding-system 'binary
+  "Coding system for the crashbox made by `mail-source-fetch-imap'.")
+
 (defun mail-source-fetch-imap (source callback)
   "Fetcher for imap sources."
   (mail-source-bind (imap source)
@@ -804,7 +808,7 @@ This only works when `display-time' is enabled."
                user (or (cdr (assoc from mail-source-password-cache))
                         password) buf)
               (imap-mailbox-select mailbox nil buf))
-         (let (str (coding-system-for-write 'binary))
+         (let (str (coding-system-for-write mail-source-imap-file-coding-system))
            (with-temp-file mail-source-crash-box
              ;; In some versions of FSF Emacs, inserting unibyte
              ;; string into multibyte buffer may convert 8-bit chars
@@ -829,7 +833,8 @@ This only works when `display-time' is enabled."
            (incf found (mail-source-callback callback server))
            (when (and remove fetchflag)
              (imap-message-flags-add
-              (imap-list-to-message-set remove) fetchflag nil buf))
+              (imap-range-to-message-set (gnus-compress-sequence remove))
+              fetchflag nil buf))
            (if dontexpunge
                (imap-mailbox-unselect buf)
              (imap-mailbox-close buf))