[Emacs-diffs] /srv/bzr/emacs/trunk r104829: gnus-draft.el (gnus-draft-clear-marks): Mark deleted articles as read.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 104829
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Fri 2011-07-01 04:08:50 +0000
message:
  gnus-draft.el (gnus-draft-clear-marks): Mark deleted articles as read.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-draft.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2011-07-01 01:34:38 +0000
+++ b/lisp/gnus/ChangeLog       2011-07-01 04:08:50 +0000
@@ -1,3 +1,7 @@
+2011-07-01  Katsumi Yamaoka  <address@hidden>
+
+       * gnus-draft.el (gnus-draft-clear-marks): Mark deleted articles as read.
+
 2011-07-01  Daiki Ueno  <address@hidden>
 
        * plstore.el (plstore-select-keys, plstore-encrypt-to): New variable.

=== modified file 'lisp/gnus/gnus-draft.el'
--- a/lisp/gnus/gnus-draft.el   2011-04-15 12:42:51 +0000
+++ b/lisp/gnus/gnus-draft.el   2011-07-01 04:08:50 +0000
@@ -325,10 +325,18 @@
        (error "The draft %s is under edit" file)))))
 
 (defun gnus-draft-clear-marks ()
-  (setq gnus-newsgroup-reads nil
-       gnus-newsgroup-marked nil
-       gnus-newsgroup-unreads
-       (gnus-uncompress-range (gnus-active gnus-newsgroup-name))))
+  (setq gnus-newsgroup-marked nil
+       gnus-newsgroup-unreads (gnus-uncompress-range
+                               (gnus-active gnus-newsgroup-name)))
+  ;; Mark articles except for deleted ones as unread.
+  (let (rest)
+    (dolist (article gnus-newsgroup-reads)
+      (when (and (consp article)
+                (eq (cdr article) gnus-canceled-mark))
+       (push article rest)
+       (setq gnus-newsgroup-unreads
+             (delq (car article) gnus-newsgroup-unreads))))
+    (setq gnus-newsgroup-reads (nreverse rest))))
 
 (provide 'gnus-draft)