comparison lisp/gnus/nnmail.el @ 153:25f70ba0133c r20-3b3

Import from CVS: tag r20-3b3
author cvs
date Mon, 13 Aug 2007 09:38:25 +0200
parents 59463afc5666
children 43dd3413c7c7
comparison
equal deleted inserted replaced
152:4c132ee2d62b 153:25f70ba0133c
1040 (run-hooks 'nnmail-split-hook) 1040 (run-hooks 'nnmail-split-hook)
1041 (if (and (symbolp nnmail-split-methods) 1041 (if (and (symbolp nnmail-split-methods)
1042 (fboundp nnmail-split-methods)) 1042 (fboundp nnmail-split-methods))
1043 (let ((split 1043 (let ((split
1044 (condition-case nil 1044 (condition-case nil
1045 ;; `nnmail-split-methods' is a function, so we
1046 ;; just call this function here and use the
1047 ;; result.
1045 (or (funcall nnmail-split-methods) 1048 (or (funcall nnmail-split-methods)
1046 '("bogus")) 1049 '("bogus"))
1047 (error 1050 (error
1048 (message 1051 (message
1049 "Error in `nnmail-split-methods'; using `bogus' mail group") 1052 "Error in `nnmail-split-methods'; using `bogus' mail group")
1050 (sit-for 1) 1053 (sit-for 1)
1051 '("bogus"))))) 1054 '("bogus")))))
1052 (unless (equal split '(junk)) 1055 ;; The article may be "cross-posted" to `junk'. What
1053 ;; `nnmail-split-methods' is a function, so we just call 1056 ;; to do? Just remove the `junk' spec. Don't really
1054 ;; this function here and use the result. 1057 ;; see anything else to do...
1058 (let (elem)
1059 (while (setq elem (assq 'junk split))
1060 (setq split (delq elem split))))
1061 (when split
1055 (setq group-art 1062 (setq group-art
1056 (mapcar 1063 (mapcar
1057 (lambda (group) (cons group (funcall func group))) 1064 (lambda (group) (cons group (funcall func group)))
1058 split)))) 1065 split))))
1059 ;; Go through the split methods to find a match. 1066 ;; Go through the split methods to find a match.
1083 (if (equal group-art '(junk)) 1090 (if (equal group-art '(junk))
1084 nil 1091 nil
1085 ;; The article may be "cross-posted" to `junk'. What 1092 ;; The article may be "cross-posted" to `junk'. What
1086 ;; to do? Just remove the `junk' spec. Don't really 1093 ;; to do? Just remove the `junk' spec. Don't really
1087 ;; see anything else to do... 1094 ;; see anything else to do...
1088 (nreverse (delq (assq 'junk group-art) group-art))))))) 1095 (let (elem)
1096 (while (setq elem (assq 'junk group-art))
1097 (setq group-art (delq elem group-art)))
1098 (nreverse group-art)))))))
1089 1099
1090 (defun nnmail-insert-lines () 1100 (defun nnmail-insert-lines ()
1091 "Insert how many lines there are in the body of the mail. 1101 "Insert how many lines there are in the body of the mail.
1092 Return the number of characters in the body." 1102 Return the number of characters in the body."
1093 (let (lines chars) 1103 (let (lines chars)