Synch to Oort Gnus.

diff --git a/ChangeLog b/ChangeLog
index 04ea943..cab9be5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2003-02-18  Simon Josefsson  <jas@extundo.com>
+
+       * GNUS-NEWS: Talk about canlock more.
+
 2003-02-13  Kai Gro\e,A_\e(Bjohann  <kai.grossjohann@uni-duisburg.de>
 
        * GNUS-NEWS: Add user visible changes from Michael Shields from

diff --git a/GNUS-NEWS b/GNUS-NEWS
index 61ed6fe..8923bb2 100644 (file)
--- 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 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2003-02-18  Jesper Harder  <harder@ifa.au.dk>
+
+       * gnus-sum.el (gnus-summary-exit-no-update): Use gnus-kill-buffer.
+
+2003-02-18  Teodor Zlatanov  <tzz@lifelogs.com>
+
+       * 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\e,A_\e(Bjohann  <kai.grossjohann@uni-duisburg.de>
 
        * 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 (file)
--- 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 (file)
--- 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 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-18  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * gnus.texi (Article Washing): Mention `g'.
+       (Customizing Articles): Added cross reference.
+
 2003-02-12  Michael Shields  <shields@msrl.com>
 
        * gnus.texi (Paging the Article): Document

diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index 2ad14fc..393e82c 100644 (file)
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -8106,6 +8106,12 @@ gnus \e$B$,5-;v$rI=<($9$k4{Dj$N$d$jJ}$rJQ$($?$$$H$-\e(B
 \e$B$3$l$O5-;v@vBu$G$O$J$/$F!"$=$N5U$G$9!#$3$l$r%?%$%W$9$k$H!"%G%#%9%/$d%5!<\e(B
 \e$B%P!<$K$"$k$,$^$^$N5-;v$,8+$($^$9!#\e(B
 
+@item g
+\e$B8=:_$N5-;v$N:FI=<($r6/@)$7$^$9\e(B (@code{gnus-summary-show-article})\e$B!#$3$l\e(B
+\e$B$b$^$?K\Ev$N@vBu$G$O$"$j$^$;$s!#$3$l$r%?%$%W$9$k$H!"0JA0$KE,MQ$5$l$?BPOC\e(B
+\e$BE*$J@vBu5!G=$O$4GK;;$K$5$l!"$9$Y$F$N%G%#%U%)%k%H$N07$$\e(B (treatments) \e$B$r<u\e(B
+\e$B$1$?5-;v$,I=<($5$l$^$9\e(B (@pxref{Customizing Articles})\e$B!#\e(B
+
 @item W l
 @kindex W l (\e$B35N,\e(B)
 @findex gnus-summary-stop-page-breaking
@@ -10061,8 +10067,8 @@ GNUS \e$B$d\e(B Gnus \e$B$G$O!"$3$N$?$A$N0-$$LdBj$G6C$+$5$l$J$$$h$&$K$9$k$K$O!"35N,
 @cindex article customization
 
 \e$B5-;v$,$I$N$h$&$KB8:_$7$F$$$k$+$r%+%9%?%^%$%:$9$k$?$a$N$?$/$5$s$N4X?t$G$9!#\e(B
-\e$B$3$l$i$N4X?t$rBPOCE*$K8F$V$3$H$b$G$-$^$9$7!"5-;v$rA*Br$7$?$H$-$K<+F0E*\e(B
-\e$B$KA*Br$9$k$3$H$b$G$-$^$9!#\e(B
+\e$B$3$l$i$N4X?t$rBPOCE*$K8F$V$3$H$b$G$-$^$9$7\e(B (@pxref{Article Washing})\e$B!"5-\e(B
+\e$B;v$rA*Br$7$?$H$-$K<+F0E*$KA*Br$9$k$3$H$b$G$-$^$9!#\e(B
 
 \e$B<+F0E*$K8F$P$l$k$h$&$K$9$k$?$a$K$O!"BP1~$9$k\e(B ``treatment'' \e$BJQ?t$r@_Dj$7\e(B
 \e$B$^$9!#Nc$($P!"%X%C%@!<$r1#$9$?$a$K$O!"\e(B@code{gnus-treat-hide-headers} \e$B$r\e(B

diff --git a/texi/gnus.texi b/texi/gnus.texi
index de5a411..f90bfed 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -8274,6 +8274,13 @@ This is not really washing, it's sort of the opposite of washing.  If
 you type this, you see the article exactly as it exists on disk or on
 the server.
 
+@item g
+Force redisplaying of the current article
+(@code{gnus-summary-show-article}).  This is also not really washing.
+If you type this, you see the article without any previously applied
+interactive Washing functions but with all default treatments
+(@pxref{Customizing Articles}).
+
 @item W l
 @kindex W l (Summary)
 @findex gnus-summary-stop-page-breaking
@@ -10592,7 +10599,8 @@ Also see @pxref{MIME Commands}.
 @cindex article customization
 
 A slew of functions for customizing how the articles are to look like
-exist.  You can call these functions interactively, or you can have them
+exist.  You can call these functions interactively
+(@pxref{Article Washing}), or you can have them
 called automatically when you select the articles.
 
 To have them called automatically, you should set the corresponding