projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(gnus-x-face-from-file):
[gnus]
/
lisp
/
nnmail.el
diff --git
a/lisp/nnmail.el
b/lisp/nnmail.el
index
1a6aafb
..
4851711
100644
(file)
--- a/
lisp/nnmail.el
+++ b/
lisp/nnmail.el
@@
-57,7
+57,7
@@
:group 'nnmail)
(defgroup nnmail-split nil
:group 'nnmail)
(defgroup nnmail-split nil
- "Organizing the incom
m
ing mail in folders."
+ "Organizing the incoming mail in folders."
:group 'nnmail)
(defgroup nnmail-files nil
:group 'nnmail)
(defgroup nnmail-files nil
@@
-117,17
+117,16
@@
If nil, the first match found will be used."
:type 'boolean)
(defcustom nnmail-split-fancy-with-parent-ignore-groups nil
:type 'boolean)
(defcustom nnmail-split-fancy-with-parent-ignore-groups nil
- "Regexp that matches group names to be ignored when applying
-
`nnmail-split-fancy-with-parent'.
This can also be a list of regexps."
+ "Regexp that matches group names to be ignored when applying
`nnmail-split-fancy-with-parent'.
+This can also be a list of regexps."
:group 'nnmail-split
:type '(choice (const :tag "none" nil)
(regexp :value ".*")
(repeat :value (".*") regexp)))
(defcustom nnmail-cache-ignore-groups nil
:group 'nnmail-split
:type '(choice (const :tag "none" nil)
(regexp :value ".*")
(repeat :value (".*") regexp)))
(defcustom nnmail-cache-ignore-groups nil
- "Regexp that matches group names to be ignored when inserting message
-ids into the cache (`nnmail-cache-insert'). This can also be a list
-of regexps."
+ "Regexp that matches group names to be ignored when inserting message ids into the cache (`nnmail-cache-insert').
+This can also be a list of regexps."
:group 'nnmail-split
:type '(choice (const :tag "none" nil)
(regexp :value ".*")
:group 'nnmail-split
:type '(choice (const :tag "none" nil)
(regexp :value ".*")
@@
-539,7
+538,7
@@
parameter. It should return nil, `warn' or `delete'."
"Coding system used in reading inbox")
(defvar nnmail-pathname-coding-system nil
"Coding system used in reading inbox")
(defvar nnmail-pathname-coding-system nil
- "*Coding system for
path
name.")
+ "*Coding system for
file
name.")
(defun nnmail-find-file (file)
"Insert FILE in server buffer safely."
(defun nnmail-find-file (file)
"Insert FILE in server buffer safely."
@@
-556,7
+555,7
@@
parameter. It should return nil, `warn' or `delete'."
(file-error nil))))
(defun nnmail-group-pathname (group dir &optional file)
(file-error nil))))
(defun nnmail-group-pathname (group dir &optional file)
- "Make
path
name for GROUP."
+ "Make
file
name for GROUP."
(concat
(let ((dir (file-name-as-directory (expand-file-name dir))))
(setq group (nnheader-replace-duplicate-chars-in-string
(concat
(let ((dir (file-name-as-directory (expand-file-name dir))))
(setq group (nnheader-replace-duplicate-chars-in-string
@@
-832,7
+831,7
@@
If SOURCE is a directory spec, try to return the group name component."
(setq head-end (point))
;; We try the Content-Length value. The idea: skip over the header
;; separator, then check what happens content-length bytes into the
(setq head-end (point))
;; We try the Content-Length value. The idea: skip over the header
;; separator, then check what happens content-length bytes into the
- ;; message body. This should be either the end o
t
the buffer, the
+ ;; message body. This should be either the end o
f
the buffer, the
;; message separator or a blank line followed by the separator.
;; The blank line should probably be deleted. If neither of the
;; three is met, the content-length header is probably invalid.
;; message separator or a blank line followed by the separator.
;; The blank line should probably be deleted. If neither of the
;; three is met, the content-length header is probably invalid.
@@
-1271,6
+1270,8
@@
See the documentation for the variable `nnmail-split-fancy' for details."
;; Builtin : operation.
((eq (car split) ':)
;; Builtin : operation.
((eq (car split) ':)
+ (when nnmail-split-tracing
+ (push split nnmail-split-trace))
(nnmail-split-it (save-excursion (eval (cdr split)))))
;; Builtin ! operation.
(nnmail-split-it (save-excursion (eval (cdr split)))))
;; Builtin ! operation.
@@
-1747,7
+1748,11
@@
See the Info node `(gnus)Fancy Mail Splitting' for more details."
(when (nnheader-functionp target)
(setq target (funcall target group)))
(unless (eq target 'delete)
(when (nnheader-functionp target)
(setq target (funcall target group)))
(unless (eq target 'delete)
- (gnus-request-accept-article target nil nil t))))
+ (when (or (gnus-request-group target)
+ (gnus-request-create-group target))
+ (let ((group-art (gnus-request-accept-article target nil nil t)))
+ (when (consp group-art)
+ (gnus-group-mark-article-read target (cdr group-art))))))))
(defun nnmail-fancy-expiry-target (group)
"Returns a target expiry group determined by `nnmail-fancy-expiry-targets'."
(defun nnmail-fancy-expiry-target (group)
"Returns a target expiry group determined by `nnmail-fancy-expiry-targets'."