pop3.el (pop3-write-to-file): Don't output messages when saving; mail-source.el ...

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index a411561545208ba5f10b909529a992bc85d4e26e..192c2c04646448c0b80b30e400c430e3d34e8816 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,5 +1,11 @@
 2010-09-04  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+       * nnml.el (nnml-save-nov): Message around nnml-save-nov so that the
+       culprit is more visible.
+
+       * mail-source.el (mail-source-delete-crash-box): Really only check the
+       incoming files once in a while.
+
        * pop3.el (pop3-streaming-movemail): Always close the pop3 connection.
 
        * mail-source.el (mail-source-delete-crash-box): Only check the

diff --git a/lisp/gnus/mail-source.el b/lisp/gnus/mail-source.el
index 080433c0d2671aa66a8aa40f5b4f2d028c8dc1f6..a8db55b182c1fdaf2eea808a05ef885eef19f0b4 100644 (file)
--- a/lisp/gnus/mail-source.el
+++ b/lisp/gnus/mail-source.el
@@ -637,20 +637,20 @@ Deleting old (> %s day(s)) incoming mail file `%s'." diff bfile)
                (> (time-to-seconds
                    (time-since mail-source-incoming-last-checked-time))
                   (* 24 60 60)))
-       (setq mail-source-incoming-last-checked-time (current-time)))
-      (let ((incoming
-            (mm-make-temp-file
-             (expand-file-name
-              mail-source-incoming-file-prefix
-              mail-source-directory))))
-       (unless (file-exists-p (file-name-directory incoming))
-         (make-directory (file-name-directory incoming) t))
-       (rename-file mail-source-crash-box incoming t)
-       ;; remove old incoming files?
-       (when (natnump mail-source-delete-incoming)
-         (mail-source-delete-old-incoming
-          mail-source-delete-incoming
-          mail-source-delete-old-incoming-confirm))))))
+       (setq mail-source-incoming-last-checked-time (current-time))
+       (let ((incoming
+              (mm-make-temp-file
+               (expand-file-name
+                mail-source-incoming-file-prefix
+                mail-source-directory))))
+         (unless (file-exists-p (file-name-directory incoming))
+           (make-directory (file-name-directory incoming) t))
+         (rename-file mail-source-crash-box incoming t)
+         ;; remove old incoming files?
+         (when (natnump mail-source-delete-incoming)
+           (mail-source-delete-old-incoming
+            mail-source-delete-incoming
+            mail-source-delete-old-incoming-confirm)))))))
 
 (defun mail-source-movemail (from to)
   "Move FROM to TO using movemail."

diff --git a/lisp/gnus/nnml.el b/lisp/gnus/nnml.el
index 5a2473a283a6a190b5e9af334c59725327ab61bb..6d5a8d20d2a5ceaa4424dcdbfa4e009df1235356 100644 (file)
--- a/lisp/gnus/nnml.el
+++ b/lisp/gnus/nnml.el
@@ -824,6 +824,7 @@ article number.  This function is called narrowed to an article."
        buffer)))
 
 (defun nnml-save-nov ()
+  (message "nnml saving nov...")
   (save-excursion
     (while nnml-nov-buffer-alist
       (when (buffer-name (cdar nnml-nov-buffer-alist))
@@ -833,7 +834,8 @@ article number.  This function is called narrowed to an article."
                               nnml-nov-buffer-file-name nil 'nomesg))
        (set-buffer-modified-p nil)
        (kill-buffer (current-buffer)))
-      (setq nnml-nov-buffer-alist (cdr nnml-nov-buffer-alist)))))
+      (setq nnml-nov-buffer-alist (cdr nnml-nov-buffer-alist))))
+  (message "nnml saving nov...done"))
 
 ;;;###autoload
 (defun nnml-generate-nov-databases (&optional server)

diff --git a/lisp/gnus/pop3.el b/lisp/gnus/pop3.el
index 51c2f1ae987b4d18f94e438684a90dc794488b8c..ed311aa888120fe8a450a369d83db2a2df0b8822 100644 (file)
--- a/lisp/gnus/pop3.el
+++ b/lisp/gnus/pop3.el
@@ -150,7 +150,7 @@ Use streaming commands."
 (defun pop3-send-streaming-command (process command count total-size)
   (erase-buffer)
   (let ((i 1))
-    (while (>= (1+ count) i)
+    (while (>= count i)
       (process-send-string process (format "%s %d\r\n" command i))
       ;; Only do 100 messages at a time to avoid pipe stalls.
       (when (zerop (% i 100))
@@ -197,7 +197,7 @@ Use streaming commands."
        ;; delete it.
        (when (eolp)
          (delete-char 1))
-       (write-region (point-min) (point-max) file)))))
+       (write-region (point-min) (point-max) file nil 'nomesg)))))
 
 (defun pop3-number-of-responses (endp)
   (let ((responses 0))