Commit f5e92214 authored by Miles Bader's avatar Miles Bader
Browse files

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-170

Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 62-64)

   - Merge from emacs--devo--0
   - Update from CVS
parent e02577b7
2006-03-21 Daniel Pittman <daniel@rimspace.net>
* nnimap.el (nnimap-request-update-info-internal): Optimize.
Don't `gnus-uncompress-range' to avoid excessive memory usage.
2006-03-21 Simon Josefsson <jas@extundo.com>
* pgg-gpg.el: Ideas below based on patch from Sascha Wilde
<wilde@sha-bang.de>.
(pgg-gpg-use-agent): New variable.
(pgg-gpg-process-region): Use it.
(pgg-gpg-encrypt-region): Likewise.
(pgg-gpg-encrypt-symmetric-region): Likewise.
(pgg-gpg-decrypt-region): Likewise.
(pgg-gpg-sign-region): Likewise.
(pgg-gpg-possibly-cache-passphrase): Don't cache a nil password.
2006-03-21 Reiner Steib <Reiner.Steib@gmx.de>
* gnus-agent.el (gnus-agent-queue-mail): Fix custom tag for `t'.
* spam.el (spam-mark-new-messages-in-spam-group-as-spam): Add
comment on version.
2006-03-20 Teodor Zlatanov <tzz@lifelogs.com>
* spam.el (spam-mark-new-messages-in-spam-group-as-spam): New
variable.
(spam-mark-junk-as-spam-routine): Use it. Allow to disable
assigning the spam-mark to new messages.
2006-03-20 Adam Sj,Ax(Bgren <asjo@koldfront.dk> (tiny change)
(spam-ham-copy-or-move-routine): Don't declare `todo' twice.
2006-03-20 Reiner Steib <Reiner.Steib@gmx.de>
* smiley.el: Add missing test smiley.
2006-03-17 Katsumi Yamaoka <yamaoka@jpl.org>
* mm-decode.el (mm-with-part): New macro.
......
......@@ -204,7 +204,7 @@ queue. Otherwise, queue if and only if unplugged."
:group 'gnus-agent
:type '(radio (const :format "Always" always)
(const :format "Never" nil)
(const :format "When plugged" t)))
(const :format "When unplugged" t)))
(defcustom gnus-agent-prompt-send-queue nil
"If non-nil, `gnus-group-send-queue' will prompt if called when
......
......@@ -1127,18 +1127,12 @@ function is generally only called when Gnus is shutting down."
(let (seen unseen)
;; read info could contain articles marked unread by other
;; imap clients! we correct this
(setq seen (gnus-uncompress-range (gnus-info-read info))
unseen (imap-search "UNSEEN UNDELETED")
seen (gnus-set-difference seen unseen)
;; seen might lack articles marked as read by other
;; imap clients! we correct this
seen (append seen (imap-search "SEEN"))
;; remove dupes
seen (sort seen '<)
seen (gnus-compress-sequence seen t)
;; we can't return '(1) since this isn't a "list of ranges",
;; and we can't return '((1)) since g-list-of-unread-articles
;; is buggy so we return '((1 . 1)).
(setq unseen (gnus-compress-sequence
(imap-search "UNSEEN UNDELETED"))
seen (gnus-range-difference (gnus-info-read info) unseen)
seen (gnus-range-add seen
(gnus-compress-sequence
(imap-search "SEEN")))
seen (if (and (integerp (car seen))
(null (cdr seen)))
(list (cons (car seen) (car seen)))
......
......@@ -42,6 +42,7 @@
;; indifferent :-|
;; wry :-/ :-\
;; sad :-(
;; frown :-{
;; evil >:-)
;; cry ;-(
;; dead X-)
......
......@@ -100,6 +100,12 @@ spam groups."
:type 'boolean
:group 'spam)
(defcustom spam-mark-new-messages-in-spam-group-as-spam t
"Whether new messages in a spam group should get the spam-mark."
:type 'boolean
;; :version "22.1" ;; Gnus 5.10.8 / No Gnus 0.3
:group 'spam)
(defcustom spam-log-to-registry nil
"Whether spam/ham processing should be logged in the registry."
:type 'boolean
......@@ -676,15 +682,17 @@ spam-use-* variable.")
;; check the global list of group names spam-junk-mailgroups and the
;; group parameters
(when (spam-group-spam-contents-p gnus-newsgroup-name)
(gnus-message 5 "Marking %s articles as spam"
(gnus-message 6 "Marking %s articles as spam"
(if spam-mark-only-unseen-as-spam
"unseen"
"unread"))
(let ((articles (if spam-mark-only-unseen-as-spam
gnus-newsgroup-unseen
gnus-newsgroup-unreads)))
(dolist (article articles)
(gnus-summary-mark-article article gnus-spam-mark)))))
(if spam-mark-new-messages-in-spam-group-as-spam
(dolist (article articles)
(gnus-summary-mark-article article gnus-spam-mark))
(gnus-message 9 "Did not mark new messages as spam.")))))
(defun spam-mark-spam-as-expired-and-move-routine (&rest groups)
(if (and (car-safe groups) (listp (car-safe groups)))
......@@ -732,7 +740,7 @@ spam-use-* variable.")
(gnus-check-backend-function
'request-move-article gnus-newsgroup-name))
(respool-method (gnus-find-method-for-group gnus-newsgroup-name))
article mark todo deletep respool)
article mark deletep respool)
(when (member 'respool groups)
(setq respool t) ; boolean for later
......
2006-03-20 Romain Francoise <romain@orebokech.com>
* gnus.texi (Mail Folders): Grammar fix.
2006-03-21 Juanma Barranquero <lekktu@gmail.com>
* files.texi (VC Dired Mode): Remove misplaced brackets.
......
......@@ -15293,7 +15293,7 @@ When the marks file is used (which it is by default), @code{nnfolder}
servers have the property that you may backup them using @code{tar} or
similar, and later be able to restore them into Gnus (by adding the
proper @code{nnfolder} server) and have all your marks be preserved.
Marks for a group is usually stored in a file named as the mbox file
Marks for a group are usually stored in a file named as the mbox file
with @code{.mrk} concatenated to it (but see
@code{nnfolder-marks-file-suffix}) within the @code{nnfolder}
directory. Individual @code{nnfolder} groups are also possible to
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment