X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fmail-source.el;h=662b999c288cbf7552e102a85cebfd9ef3d10220;hb=d8a1e36b61370cac2eb5249b16e1d0f4ced511b9;hp=7a626869347cd5eb790716e5a0a176395916cbe2;hpb=4af473c64ef3532e95daf8ca349e97da755daf1c;p=gnus

diff --git a/lisp/mail-source.el b/lisp/mail-source.el
index 7a6268693..662b999c2 100644
--- a/lisp/mail-source.el
+++ b/lisp/mail-source.el
@@ -34,7 +34,7 @@
   (require 'cl)
   (require 'imap))
 (autoload 'auth-source-user-or-password "auth-source")
-(autoload 'pop3-streaming-movemail "pop3")
+(autoload 'pop3-movemail "pop3")
 (autoload 'pop3-get-message-count "pop3")
 (autoload 'nnheader-cancel-timer "nnheader")
 (require 'mm-util)
@@ -544,11 +544,16 @@ Return the number of files that were found."
   (mail-source-bind-common source
     (if (or mail-source-plugged plugged)
 	(save-excursion
-	  (nnheader-message 4 "%sReading incoming mail from %s..."
-			    (if method
-				(format "%s: " method)
-			      "")
-			    (car source))
+	  ;; Special-case the `file' handler since it's so common and
+	  ;; just adds noise.
+	  (when (or (not (eq (car source) 'file))
+		    (mail-source-bind (file source)
+		      (file-exists-p path)))
+	    (nnheader-message 4 "%sReading incoming mail from %s..."
+			      (if method
+				  (format "%s: " method)
+				"")
+			      (car source)))
 	  (let ((function (cadr (assq (car source) mail-source-fetcher-alist)))
 		(found 0))
 	    (unless function
@@ -834,11 +839,9 @@ Deleting old (> %s day(s)) incoming mail file `%s'." diff bfile)
 		     (if (eq authentication 'apop) 'apop 'pass))
 		    (pop3-stream-type stream))
 		(if (or debug-on-quit debug-on-error)
-		    (save-excursion (pop3-streaming-movemail
-				     mail-source-crash-box))
+		    (save-excursion (pop3-movemail mail-source-crash-box))
 		  (condition-case err
-		      (save-excursion (pop3-streaming-movemail
-				       mail-source-crash-box))
+		      (save-excursion (pop3-movemail mail-source-crash-box))
 		    (error
 		     ;; We nix out the password in case the error
 		     ;; was because of a wrong password being given.