From ec2d39b0e6bf07f36ede711375e503ab5879368d Mon Sep 17 00:00:00 2001 From: yamaoka Date: Sat, 7 Sep 2002 02:04:21 +0000 Subject: [PATCH] Synch with Oort Gnus. --- lisp/ChangeLog | 10 ++++++++++ lisp/gnus-srvr.el | 52 ++++++++++++++++++++++++++++------------------------ lisp/gnus-sum.el | 9 +++++++++ texi/ChangeLog | 5 +++++ texi/gnus-ja.texi | 11 +++++++++++ texi/gnus.texi | 11 +++++++++++ 6 files changed, 74 insertions(+), 24 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b323be6..a4cae14 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,13 @@ +2002-09-06 Lars Magne Ingebrigtsen + + * gnus-srvr.el (gnus-browse-make-menu-bar): Add "d". + + * gnus-sum.el (gnus-summary-limit-to-unseen): New command and + keystroke. + + * gnus-srvr.el (gnus-browse-describe-group): New command and + keystroke. + 2002-09-06 Katsumi Yamaoka * gnus-art.el (gnus-article-treat-body-boundary): Don't quote a diff --git a/lisp/gnus-srvr.el b/lisp/gnus-srvr.el index ff93f6b..7aea332 100644 --- a/lisp/gnus-srvr.el +++ b/lisp/gnus-srvr.el @@ -662,6 +662,7 @@ The following commands are available: "L" gnus-browse-exit "q" gnus-browse-exit "Q" gnus-browse-exit + "d" gnus-browse-describe-group "\C-c\C-c" gnus-browse-exit "?" gnus-browse-describe-briefly @@ -677,6 +678,7 @@ The following commands are available: ["Subscribe" gnus-browse-unsubscribe-current-group t] ["Read" gnus-browse-read-group t] ["Select" gnus-browse-select-group t] + ["Describe" gnus-browse-describe-groups t] ["Next" gnus-browse-next-group t] ["Prev" gnus-browse-prev-group t] ["Exit" gnus-browse-exit t])) @@ -719,22 +721,22 @@ The following commands are available: (delete-matching-lines gnus-ignored-newsgroups)) (while (not (eobp)) (ignore-errors - (push (cons - (if (eq (char-after) ?\") - (read cur) - (let ((p (point)) (name "")) - (skip-chars-forward "^ \t\\\\") - (setq name (buffer-substring p (point))) - (while (eq (char-after) ?\\) - (setq p (1+ (point))) - (forward-char 2) - (skip-chars-forward "^ \t\\\\") - (setq name (concat name (buffer-substring - p (point))))) - name)) - (let ((last (read cur))) - (cons (read cur) last))) - groups)) + (push (cons + (if (eq (char-after) ?\") + (read cur) + (let ((p (point)) (name "")) + (skip-chars-forward "^ \t\\\\") + (setq name (buffer-substring p (point))) + (while (eq (char-after) ?\\) + (setq p (1+ (point))) + (forward-char 2) + (skip-chars-forward "^ \t\\\\") + (setq name (concat name (buffer-substring + p (point))))) + name)) + (let ((last (read cur))) + (cons (read cur) last))) + groups)) (forward-line)))) (setq groups (sort groups (lambda (l1 l2) @@ -764,18 +766,19 @@ The following commands are available: (list (format "Gnus: %%b {%s:%s}" (car method) (cadr method)))) - (let ((buffer-read-only nil) charset + (let ((buffer-read-only nil) + charset (prefix (let ((gnus-select-method orig-select-method)) (gnus-group-prefixed-name "" method)))) - (while groups - (setq group (car groups)) + (dolist (group groups) (setq charset (gnus-group-name-charset method (car group))) (gnus-add-text-properties (point) (prog1 (1+ (point)) (insert (format "%c%7d: %s\n" - (let ((level (gnus-group-level (concat prefix (car group))))) + (let ((level (gnus-group-level + (concat prefix (car group))))) (cond ((<= level gnus-level-subscribed) ? ) ((<= level gnus-level-unsubscribed) ?U) @@ -878,6 +881,11 @@ buffer. (match-string-no-properties 1)) gnus-browse-current-method))))) +(defun gnus-browse-describe-group (group) + "Describe the current group." + (interactive (list (gnus-browse-group-name))) + (gnus-group-describe-group nil group)) + (defun gnus-browse-unsubscribe-group () "Toggle subscription of the current group in the browse buffer." (let ((sub nil) @@ -889,10 +897,6 @@ buffer. (unless (eq (char-after) ? ) (setq sub t)) (setq group (gnus-browse-group-name)) - ;;;; - ;;(when (and sub - ;; (cadr (gnus-gethash group gnus-newsrc-hashtb))) - ;;(error "Group already subscribed")) (if sub (progn ;; Make sure the group has been properly removed before we diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el index 67e3e5e..7e372f4 100644 --- a/lisp/gnus-sum.el +++ b/lisp/gnus-sum.el @@ -1678,6 +1678,7 @@ increase the score of each group you read." "T" gnus-summary-limit-include-thread "d" gnus-summary-limit-exclude-dormant "t" gnus-summary-limit-to-age + "." gnus-summary-limit-to-unseen "x" gnus-summary-limit-to-extra "p" gnus-summary-limit-to-display-predicate "E" gnus-summary-limit-include-expunged @@ -2267,6 +2268,7 @@ gnus-summary-show-article-from-menu-as-charset-%s" cs)))) ["Score..." gnus-summary-limit-to-score t] ["Display Predicate" gnus-summary-limit-to-display-predicate t] ["Unread" gnus-summary-limit-to-unread t] + ["Unseen" gnus-summary-limit-to-unseen t] ["Non-dormant" gnus-summary-limit-exclude-dormant t] ["Articles" gnus-summary-limit-to-articles t] ["Pop limit" gnus-summary-pop-limit t] @@ -7406,6 +7408,13 @@ Returns how many articles were removed." (gnus-summary-limit articles) (gnus-summary-position-point)))) +(defun gnus-summary-limit-to-unseen () + "Limit to unseen articles." + (interactive) + (prog1 + (gnus-summary-limit gnus-newsgroup-unseen) + (gnus-summary-position-point))) + (defun gnus-summary-limit-include-thread (id) "Display all the hidden articles that is in the thread with ID in it. When called interactively, ID is the Message-ID of the current diff --git a/texi/ChangeLog b/texi/ChangeLog index 0844b79..ccd5d19 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -1,3 +1,8 @@ +2002-09-06 Lars Magne Ingebrigtsen + + * gnus.texi (Browse Foreign Server): Addition. + (Limiting): Addition.articles + 2002-09-04 Simon Josefsson * gnus.texi (Mail Source Specifiers): Fix. diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi index 8dc3481..2b9622a 100644 --- a/texi/gnus-ja.texi +++ b/texi/gnus-ja.texi @@ -3432,6 +3432,11 @@ kill $B$5$l$?%0%k!<%W$rA4$FI=<($7$^$9(B (@code{gnus-group-list-killed})$B!#@\ @findex gnus-browse-exit $B1\Mw%b!<%I(B (browse mode) $B$r=*N;$7$^$9(B (@code{gnus-browse-exit})$B!#(B +@item d +@kindex d ($B1\Mw(B) +@findex gnus-browse-describe-group +$B8=:_$N%0%k!<%W$r9XFI$K$7$^$9(B (@code{gnus-browse-describe-group})$B!#(B + @item ? @kindex ? ($B1\Mw(B) @findex gnus-browse-describe-briefly @@ -6035,6 +6040,12 @@ gnus $B<+BN$O2D;k5-;v$r4|8B@Z$l>C5n$7$^$;$s(B) $B$N$G!"1J1s$K5-;v$rJ]B8$7$F$* $B$9(B (@code{gnus-summary-pop-limit})$B!#$b$7@\F,0z?t$rM?$($i$l$l$P!"$9$Y$F$N(B $B@)8B$r%9%?%C%/$+$i