2001-10-18 Simon Josefsson <jas@extundo.com>

	* gnus-sum.el (gnus-group-make-articles-read): Call g-r-set-mark
	when undoing.

2001-10-18  Simon Josefsson  <jas@extundo.com>
	From Frank Schmitt <usereplyto@Frank-Schmitt.net>

	* gnus-sum.el (gnus-summary-limit-to-display-predicate): Fix typo.

2001-10-17  Simon Josefsson  <jas@extundo.com>

	* nnimap.el (nnimap-expiry-target): Make sure it is back to the
	server. Suggested by ShengHuo ZHU <zsh@cs.rochester.edu>.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ec54241..4b81e0d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,18 @@
+2001-10-18  Simon Josefsson  <jas@extundo.com>
+
+       * gnus-sum.el (gnus-group-make-articles-read): Call g-r-set-mark
+       when undoing.
+
+2001-10-18  Simon Josefsson  <jas@extundo.com>
+       From Frank Schmitt <usereplyto@Frank-Schmitt.net>
+
+       * gnus-sum.el (gnus-summary-limit-to-display-predicate): Fix typo.
+
+2001-10-17  Simon Josefsson  <jas@extundo.com>
+
+       * nnimap.el (nnimap-expiry-target): Make sure it is back to the
+       server. Suggested by ShengHuo ZHU <zsh@cs.rochester.edu>.
+
 2001-10-17 17:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * gnus-sum.el (gnus-summary-line-format-alist): user-date entry.

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 8ee1cd2..b14d2b0 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -5128,6 +5128,7 @@ The resulting hash table is returned, or nil if no Xrefs were found."
             (gnus-info-set-marks ',info ',(gnus-info-marks info) t)
             (gnus-info-set-read ',info ',(gnus-info-read info))
             (gnus-get-unread-articles-in-group ',info (gnus-active ,group))
+            (gnus-request-set-mark group (list (list ',range 'del '(read))))
             (gnus-group-update-group ,group t))))
       ;; Add the read articles to the range.
       (gnus-info-set-read info range)
@@ -6894,7 +6895,7 @@ articles that are younger than AGE days."
   "Limit the summary buffer to the predicated in the `display' group parameter."
   (interactive)
   (unless gnus-newsgroup-display
-    (error "There is no `diplay' group parameter"))
+    (error "There is no `display' group parameter"))
   (let (articles)
     (dolist (number gnus-newsgroup-articles)
       (when (funcall gnus-newsgroup-display)

diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index cbb2f73..ef5e3d8 100644 (file)
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -896,8 +896,8 @@ function is generally only called when Gnus is shutting down."
                  ;; 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
+                 ;; 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)).
                  seen (if (and (integerp (car seen))
                                (null (cdr seen)))
@@ -1071,17 +1071,17 @@ function is generally only called when Gnus is shutting down."
                         (message "IMAP split moved %s:%s:%d to %s" server
                                  inbox article to-group)
                         (setq removeorig t)
-                       ;; Add the group-art list to the history list.
+                        ;; Add the group-art list to the history list.
                         (push (list (cons to-group 0)) nnmail-split-history))
                        (t
                         (message "IMAP split failed to move %s:%s:%d to %s"
                                  server inbox article to-group))))
-            ;; remove article if it was successfully copied somewhere
+               ;; remove article if it was successfully copied somewhere
                (and removeorig
                     (imap-message-flags-add (format "%d" article)
                                             "\\Seen \\Deleted")))))
          (when (imap-mailbox-select inbox) ;; just in case
-       ;; todo: UID EXPUNGE (if available) to remove splitted articles
+           ;; todo: UID EXPUNGE (if available) to remove splitted articles
            (imap-mailbox-expunge)
            (imap-mailbox-close)))
        t))))
@@ -1154,7 +1154,10 @@ function is generally only called when Gnus is shutting down."
        (let ((nnimap-current-move-article art)
              (nnimap-current-move-group group)
              (nnimap-current-move-server server))
-         (nnmail-expiry-target-group nnmail-expiry-target group))))))
+         (nnmail-expiry-target-group nnmail-expiry-target group))))
+    ;; It is not clear if `nnmail-expiry-target' somehow cause the
+    ;; current group to be changed or not, so we make sure here.
+    (nnimap-possibly-change-group group server)))
 
 ;; Notice that we don't actually delete anything, we just mark them deleted.
 (deffoo nnimap-request-expire-articles (articles group &optional server force)