Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d0b962a..957b016 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2001-05-31 13:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * gnus-sum.el (gnus-summary-catchup): New argument.
+       (gnus-summary-catchup-from-here): New function.
+
 2001-05-30  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
        * mm-view.el (mm-inline-image-xemacs): Insert newline, then move

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index d972108..8467b58 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -1557,6 +1557,7 @@ increase the score of each group you read."
     "S" gnus-summary-limit-include-expunged
     "C" gnus-summary-catchup
     "H" gnus-summary-catchup-to-here
+    "h" gnus-summary-catchup-from-here
     "\C-c" gnus-summary-catchup-all
     "k" gnus-summary-kill-same-subject-and-select
     "K" gnus-summary-kill-same-subject
@@ -2021,6 +2022,7 @@ increase the score of each group you read."
             '(:help "Mark unread articles in this group as read"))]
        ["Catchup all" gnus-summary-catchup-all t]
        ["Catchup to here" gnus-summary-catchup-to-here t]
+       ["Catchup from here" gnus-summary-catchup-from-here t]
        ["Catchup region" gnus-summary-mark-region-as-read t]
        ["Mark excluded" gnus-summary-limit-mark-excluded-as-read t])
        ("Mark Various"
@@ -9132,13 +9134,13 @@ even ticked and dormant ones."
        (gnus-summary-position-point)
        t))))
 
-(defun gnus-summary-catchup (&optional all quietly to-here not-mark)
+(defun gnus-summary-catchup (&optional all quietly to-here not-mark reverse)
   "Mark all unread articles in this newsgroup as read.
 If prefix argument ALL is non-nil, ticked and dormant articles will
 also be marked as read.
 If QUIETLY is non-nil, no questions will be asked.
 If TO-HERE is non-nil, it should be a point in the buffer.  All
-articles before this point will be marked as read.
+articles before (after, if REVERSE is set) this point will be marked as read.
 Note that this function will only catch up the unread article
 in the current summary buffer limitation.
 The number of articles marked as read is returned."
@@ -9166,11 +9168,17 @@ The number of articles marked as read is returned."
            ;; We actually mark all articles as canceled, which we
            ;; have to do when using auto-expiry or adaptive scoring.
            (gnus-summary-show-all-threads)
-           (when (gnus-summary-first-subject (not all) t)
-             (while (and
-                     (if to-here (< (point) to-here) t)
-                     (gnus-summary-mark-article-as-read gnus-catchup-mark)
-                     (gnus-summary-find-next (not all) nil nil t))))
+           (if (and to-here reverse)
+               (progn
+                 (goto-char to-here)
+                 (while (and
+                         (gnus-summary-mark-article-as-read gnus-catchup-mark)
+                         (gnus-summary-find-next (not all) nil nil t))))
+             (when (gnus-summary-first-subject (not all) t)
+               (while (and
+                       (if to-here (< (point) to-here) t)
+                       (gnus-summary-mark-article-as-read gnus-catchup-mark)
+                       (gnus-summary-find-next (not all) nil nil t)))))
            (gnus-set-mode-line 'summary))
          t))
     (gnus-summary-position-point)))
@@ -9187,6 +9195,18 @@ If ALL is non-nil, also mark ticked and dormant articles as read."
          (gnus-summary-catchup all t beg)))))
   (gnus-summary-position-point))
 
+(defun gnus-summary-catchup-from-here (&optional all)
+  "Mark all unticked articles after the current one as read.
+If ALL is non-nil, also mark ticked and dormant articles as read."
+  (interactive "P")
+  (save-excursion
+    (gnus-save-hidden-threads
+      (let ((beg (point)))
+       ;; We check that there are unread articles.
+       (when (or all (gnus-summary-find-next))
+         (gnus-summary-catchup all t beg nil t)))))
+  (gnus-summary-position-point))
+
 (defun gnus-summary-catchup-all (&optional quietly)
   "Mark all articles in this newsgroup as read."
   (interactive "P")

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 848469a..4fddf68 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,7 @@
+2001-05-31 13:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * gnus.texi (Setting Marks): Add.
+
 2001-05-27  Simon Josefsson  <simon@josefsson.org>
 
        * message.texi (Insertion): Add message-yank-cited-prefix.

diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index e131f55..dc1bd86 100644 (file)
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -5128,9 +5128,15 @@ gnus \e$B<+BN$O2D;k5-;v$r4|8B@Z$l>C5n$7$^$;$s\e(B) \e$B$N$G!"1J1s$K5-;v$rJ]B8$7$F$*
 @item M H
 @kindex M H (\e$B35N,\e(B)
 @findex gnus-summary-catchup-to-here
-\e$B8=:_$N%0%k!<%W$N%]%$%s%H$^$G$r4{FI$H$7$F0u$rIU$1$^\e(B
+\e$B8=:_$N%0%k!<%W$N!"8=:_0LCV$H$=$l0JA0$N5-;v$r4{FI$H$7$F0u$rIU$1$^\e(B
 \e$B$9\e(B (@code{gnus-summary-catchup-to-here})\e$B!#\e(B
 
+@item M h
+@kindex M h (\e$B35N,\e(B)
+@findex gnus-summary-catchup-from-here
+\e$B8=:_$N%0%k!<%W$N!"8=:_0LCV$H$=$l0J9_$N5-;v$r4{FI$H$7$F0u$rIU$1$^\e(B
+\e$B$9\e(B (@code{gnus-summary-catchup-from-here})\e$B!#\e(B
+
 @item C-w
 @kindex C-w (\e$B35N,\e(B)
 @findex gnus-summary-mark-region-as-read

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 125fa30..6da0766 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -5171,9 +5171,15 @@ articles (@code{gnus-summary-catchup-all}).
 @item M H
 @kindex M H (Summary)
 @findex gnus-summary-catchup-to-here
-Catchup the current group to point
+Catchup the current group to point (before the point)
 (@code{gnus-summary-catchup-to-here}).
 
+@item M h
+@kindex M h (Summary)
+@findex gnus-summary-catchup-from-here
+Catchup the current group from point (after the point)
+(@code{gnus-summary-catchup-from-here}).
+
 @item C-w
 @kindex C-w (Summary)
 @findex gnus-summary-mark-region-as-read