diff options
| author | Lars Magne Ingebrigtsen | 2010-09-05 23:38:33 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka | 2010-09-05 23:38:33 +0000 |
| commit | 8695c9a712dcc123d7a775a64bc4201269e86dfc (patch) | |
| tree | bd6eebfa2dff41dfc68625c6adca183d9c7280d8 | |
| parent | 3ff31c90aba813d55ebff119ba678fcaf9d9619b (diff) | |
| download | emacs-8695c9a712dcc123d7a775a64bc4201269e86dfc.tar.gz emacs-8695c9a712dcc123d7a775a64bc4201269e86dfc.zip | |
mail-source.el (mail-source-fetch): Don't message if we're fetching mail from a file, and the file doesn't exist.
| -rw-r--r-- | lisp/gnus/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/gnus/mail-source.el | 15 |
2 files changed, 13 insertions, 5 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index bc814ee3a92..24a5c8dee4e 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2010-09-05 Lars Magne Ingebrigtsen <larsi@gnus.org> | 1 | 2010-09-05 Lars Magne Ingebrigtsen <larsi@gnus.org> |
| 2 | 2 | ||
| 3 | * mail-source.el (mail-source-fetch): Don't message if we're fetching | ||
| 4 | mail from a file, and the file doesn't exist. | ||
| 5 | |||
| 3 | * pop3.el (pop3-streaming-movemail): Return t for success. | 6 | * pop3.el (pop3-streaming-movemail): Return t for success. |
| 4 | 7 | ||
| 5 | * nnimap.el (nnimap-open-connection): Look for the "imaps" entry in the | 8 | * nnimap.el (nnimap-open-connection): Look for the "imaps" entry in the |
diff --git a/lisp/gnus/mail-source.el b/lisp/gnus/mail-source.el index 7a626869347..d3ceb6dfd07 100644 --- a/lisp/gnus/mail-source.el +++ b/lisp/gnus/mail-source.el | |||
| @@ -544,11 +544,16 @@ Return the number of files that were found." | |||
| 544 | (mail-source-bind-common source | 544 | (mail-source-bind-common source |
| 545 | (if (or mail-source-plugged plugged) | 545 | (if (or mail-source-plugged plugged) |
| 546 | (save-excursion | 546 | (save-excursion |
| 547 | (nnheader-message 4 "%sReading incoming mail from %s..." | 547 | ;; Special-case the `file' handler since it's so common and |
| 548 | (if method | 548 | ;; just adds noise. |
| 549 | (format "%s: " method) | 549 | (when (or (not (eq (car source) 'file)) |
| 550 | "") | 550 | (mail-source-bind (file source) |
| 551 | (car source)) | 551 | (file-exists-p path))) |
| 552 | (nnheader-message 4 "%sReading incoming mail from %s..." | ||
| 553 | (if method | ||
| 554 | (format "%s: " method) | ||
| 555 | "") | ||
| 556 | (car source))) | ||
| 552 | (let ((function (cadr (assq (car source) mail-source-fetcher-alist))) | 557 | (let ((function (cadr (assq (car source) mail-source-fetcher-alist))) |
| 553 | (found 0)) | 558 | (found 0)) |
| 554 | (unless function | 559 | (unless function |