aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarl Fogel2006-07-21 06:34:45 +0000
committerKarl Fogel2006-07-21 06:34:45 +0000
commit06dc832132e0b53690d8045aee60d3926ff389e3 (patch)
treeb5d2c8cc31d1b00cfb5fe26ec5c2c241cc13b079
parent3a723c3afafefb2f75634691f14ab9f7bf307a8c (diff)
downloademacs-06dc832132e0b53690d8045aee60d3926ff389e3.tar.gz
emacs-06dc832132e0b53690d8045aee60d3926ff389e3.zip
(nnmail-article-group): If splitting raises an error, give some
information about the error when saying that the `bogus' mail group will be used.
-rw-r--r--lisp/gnus/ChangeLog6
-rw-r--r--lisp/gnus/nnmail.el4
2 files changed, 8 insertions, 2 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index f05d0efbf87..060676fcf61 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,9 @@
12006-07-18 Karl Fogel <kfogel@red-bean.com>
2
3 * nnmail.el (nnmail-article-group): If splitting raises an error, give
4 some information about the error when saying that the `bogus' mail
5 group will be used.
6
12006-07-18 Andreas Seltenreich <uwi7@rz.uni-karlsruhe.de> 72006-07-18 Andreas Seltenreich <uwi7@rz.uni-karlsruhe.de>
2 8
3 [ Backported bug fixes from No Gnus. ] 9 [ Backported bug fixes from No Gnus. ]
diff --git a/lisp/gnus/nnmail.el b/lisp/gnus/nnmail.el
index f4275fa8ed5..98af7ba41f2 100644
--- a/lisp/gnus/nnmail.el
+++ b/lisp/gnus/nnmail.el
@@ -1131,7 +1131,7 @@ FUNC will be called with the group name to determine the article number."
1131 (if (and (symbolp nnmail-split-methods) 1131 (if (and (symbolp nnmail-split-methods)
1132 (fboundp nnmail-split-methods)) 1132 (fboundp nnmail-split-methods))
1133 (let ((split 1133 (let ((split
1134 (condition-case nil 1134 (condition-case error-info
1135 ;; `nnmail-split-methods' is a function, so we 1135 ;; `nnmail-split-methods' is a function, so we
1136 ;; just call this function here and use the 1136 ;; just call this function here and use the
1137 ;; result. 1137 ;; result.
@@ -1139,7 +1139,7 @@ FUNC will be called with the group name to determine the article number."
1139 '("bogus")) 1139 '("bogus"))
1140 (error 1140 (error
1141 (nnheader-message 1141 (nnheader-message
1142 5 "Error in `nnmail-split-methods'; using `bogus' mail group") 1142 5 "Error in `nnmail-split-methods'; using `bogus' mail group: %S" error-info)
1143 (sit-for 1) 1143 (sit-for 1)
1144 '("bogus"))))) 1144 '("bogus")))))
1145 (setq split (mm-delete-duplicates split)) 1145 (setq split (mm-delete-duplicates split))