From ddd3a8cff0da0d1f55ba86d87acea08458eff497 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Wed, 19 Feb 2003 00:08:06 +0000 Subject: [PATCH] Synch to Oort Gnus. --- ChangeLog | 4 ++++ GNUS-NEWS | 12 ++++++++---- lisp/ChangeLog | 11 +++++++++++ lisp/gnus-sum.el | 3 +-- lisp/spam.el | 13 ++++++++----- texi/ChangeLog | 5 +++++ texi/gnus-ja.texi | 10 ++++++++-- texi/gnus.texi | 10 +++++++++- 8 files changed, 54 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 04ea943..cab9be5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2003-02-18 Simon Josefsson + + * GNUS-NEWS: Talk about canlock more. + 2003-02-13 Kai Gro,A_(Bjohann * GNUS-NEWS: Add user visible changes from Michael Shields from diff --git a/GNUS-NEWS b/GNUS-NEWS index 61ed6fe..8923bb2 100644 --- a/GNUS-NEWS +++ b/GNUS-NEWS @@ -235,10 +235,14 @@ values. ** Gnus supports Cancel Locks in News. -This means a header "Cancel-Lock" is inserted in news posting. It is -used to determine if you wrote a article or not (for -cancelling/superseding). The behaviour can be changed by customizing -`message-insert-canlock'. +This means a header "Cancel-Lock" is inserted in news posting. It is +used to determine if you wrote a article or not (for cancelling and +superseding). Gnus generates a random password string the first time +you post a message, and saves it in your ~/.emacs using the Custom +system. While the variable is called `canlock-password', it is not +security sensitive data. Publishing your canlock string on the web +will not allow anyone to be able to anything she could not already do. +The behaviour can be changed by customizing `message-insert-canlock'. ** Gnus supports server-side mail filtering using Sieve. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index afeaaa9..5a9537e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,14 @@ +2003-02-18 Jesper Harder + + * gnus-sum.el (gnus-summary-exit-no-update): Use gnus-kill-buffer. + +2003-02-18 Teodor Zlatanov + + * spam.el (spam-ham-move-routine) + (spam-mark-spam-as-expired-and-move-routine): use + gnus-summary-kill-process-mark and gnus-summary-yank-process-mark + around process-mark manipulation on the group + 2003-02-17 Kai Gro,A_(Bjohann * gnus-sum.el (gnus-summary-make-menu-bar): Add MIME/Multipart diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el index 32bdb0a..8261085 100644 --- a/lisp/gnus-sum.el +++ b/lisp/gnus-sum.el @@ -6505,8 +6505,7 @@ If FORCE (the prefix), also save the .newsrc file(s)." (gnus-summary-clear-local-variables) (let ((gnus-summary-local-variables gnus-newsgroup-variables)) (gnus-summary-clear-local-variables)) - (when (get-buffer gnus-summary-buffer) - (kill-buffer gnus-summary-buffer))) + (gnus-kill-buffer gnus-summary-buffer)) (unless gnus-single-article-buffer (setq gnus-article-current nil)) (when gnus-use-trees diff --git a/lisp/spam.el b/lisp/spam.el index 66fd6df..b1f545c 100644 --- a/lisp/spam.el +++ b/lisp/spam.el @@ -365,12 +365,13 @@ your main source of newsgroup names." (when (not (spam-group-spam-contents-p gnus-newsgroup-name)) (spam-mark-spam-as-expired-and-move-routine (gnus-parameter-spam-process-destination gnus-newsgroup-name))) - (gnus-message 5 "Marking spam as expired and moving it") + (gnus-message 5 "Marking spam as expired and moving it to %s" gnus-newsgroup-name) (spam-mark-spam-as-expired-and-move-routine (gnus-parameter-spam-process-destination gnus-newsgroup-name))) ;; now we redo spam-mark-spam-as-expired-and-move-routine to only ;; expire spam, in case the above did not expire them + (gnus-message 5 "Marking spam as expired without moving it") (spam-mark-spam-as-expired-and-move-routine nil) (when (spam-group-ham-contents-p gnus-newsgroup-name) @@ -411,10 +412,10 @@ your main source of newsgroup names." (gnus-summary-mark-article article gnus-spam-mark)))))) (defun spam-mark-spam-as-expired-and-move-routine (&optional group) + (gnus-summary-kill-process-mark) (let ((articles gnus-newsgroup-articles) article tomove) (dolist (article articles) - (gnus-summary-remove-process-mark article) (when (eq (gnus-summary-article-mark article) gnus-spam-mark) (gnus-summary-mark-article article gnus-expirable-mark) (push article tomove))) @@ -423,9 +424,11 @@ your main source of newsgroup names." (when (stringp group) (dolist (article tomove) (gnus-summary-set-process-mark article)) - (when tomove (gnus-summary-move-article nil group))))) + (when tomove (gnus-summary-move-article nil group)))) + (gnus-summary-yank-process-mark)) (defun spam-ham-move-routine (&optional group) + (gnus-summary-kill-process-mark) (let ((articles gnus-newsgroup-articles) article ham-mark-values mark tomove) (when (stringp group) ; this routine will do nothing @@ -433,14 +436,14 @@ your main source of newsgroup names." (dolist (mark spam-ham-marks) (push (symbol-value mark) ham-mark-values)) (dolist (article articles) - (gnus-summary-remove-process-mark article) (when (memq (gnus-summary-article-mark article) ham-mark-values) (push article tomove))) ;; now do the actual move (dolist (article tomove) (gnus-summary-set-process-mark article)) - (when tomove (gnus-summary-move-article nil group))))) + (when tomove (gnus-summary-move-article nil group)))) + (gnus-summary-yank-process-mark)) (defun spam-generic-register-routine (spam-func ham-func) (let ((articles gnus-newsgroup-articles) diff --git a/texi/ChangeLog b/texi/ChangeLog index 7cd6df6..d56c912 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -1,3 +1,8 @@ +2003-02-18 Reiner Steib + + * gnus.texi (Article Washing): Mention `g'. + (Customizing Articles): Added cross reference. + 2003-02-12 Michael Shields * gnus.texi (Paging the Article): Document diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi index 2ad14fc..393e82c 100644 --- a/texi/gnus-ja.texi +++ b/texi/gnus-ja.texi @@ -8106,6 +8106,12 @@ gnus $B$,5-;v$rI=<($9$k4{Dj$N$d$jJ}$rJQ$($?$$$H$-(B $B$3$l$O5-;v@vBu$G$O$J$/$F!"$=$N5U$G$9!#$3$l$r%?%$%W$9$k$H!"%G%#%9%/$d%5!<(B $B%P!<$K$"$k$,$^$^$N5-;v$,8+$($^$9!#(B +@item g +$B8=:_$N5-;v$N:FI=<($r6/@)$7$^$9(B (@code{gnus-summary-show-article})$B!#$3$l(B +$B$b$^$?K\Ev$N@vBu$G$O$"$j$^$;$s!#$3$l$r%?%$%W$9$k$H!"0JA0$KE,MQ$5$l$?BPOC(B +$BE*$J@vBu5!G=$O$4GK;;$K$5$l!"$9$Y$F$N%G%#%U%)%k%H$N07$$(B (treatments) $B$r