Synch with Oort Gnus.

diff --git a/ChangeLog b/ChangeLog
index 0a70efd..51e2644 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-13  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * lisp/gnus-sum.el (gnus-summary-wash-map): Remove
+       `gnus-smiley-display'.
+
 2001-11-11  Simon Josefsson  <jas@extundo.com>
 
        * make-x.bat: Don't use -nw.  Suggested by Frank Haun

diff --git a/GNUS-NEWS b/GNUS-NEWS
index 8c8c7bc..cd9595f 100644 (file)
--- a/GNUS-NEWS
+++ b/GNUS-NEWS
@@ -8,8 +8,21 @@ For older news, see Gnus info node "New Features".
 \f
 * Changes in Oort Gnus
 
+** 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'.
+
 ** Gnus supports server-side mail filtering using Sieve.
 
+Sieve rules can be added as Group Parameters for groups, and the
+complete Sieve script is generated using `D g' from the Group buffer,
+and then uploaded to the server using `C-c C-l' in the generated Sieve
+buffer.  Search the online Gnus manual for "sieve", and see the new
+Sieve manual, for more information.
+
 ** Extended format specs.
 
 Format spec "%&user-date;" is added into
@@ -35,15 +48,21 @@ This is supposedly what USEFOR wants to migrate to.  See
 This makes it possible to take backup of nnml/nnfolder servers/groups
 separately of .newsrc.eld, while preserving marks.  It also makes it
 possible to share articles and marks between users (without sharing
-.newsrc.eld) within e.g. a department.
+the .newsrc.eld file) within e.g. a department.  It works by storing
+the marks stored in .newsrc.eld in a per-group file ".marks" (for
+nnml) and "groupname.mrk" (for nnfolder, named "groupname").  If the
+nnml/nnfolder is moved to another machine, Gnus will automatically use
+the .marks or .mrk file instead of the information in .newsrc.eld.
+The new server variables `nnml-marks-is-evil' and
+`nnfolder-marks-is-evil' can be used to disable this feature.
 
 ** The menu bar (in Group and Summary buffer) named "Misc" has been
-   renamed to "Gnus".
+renamed to "Gnus".
 
 ** The menu bar (in Message mode) named "MML" has been renamed to
-   "Attachments".
+"Attachments".
 
-** gnus-group-charset-alist and gnus-group-ignored-charsets-alist
+** gnus-group-charset-alist and gnus-group-ignored-charsets-alist.
 
 The regexps in these variables are compared with full group names
 instead of real group names in 5.8.  Users who customize these
@@ -51,7 +70,7 @@ variables should change those regexps accordingly. For example:
 
    ("^han\\>" euc-kr) -> ("\\(^\\|:\\)han\\>" euc-kr)
 
-** Gnus now supports PGP (RFC 1991), PGP-MIME (RFC 2015/3156) and
+** Gnus supports PGP (RFC 1991/2440), PGP-MIME (RFC 2015/3156) and
 SMIME.
 
 ** Gnus inlines external parts (message/external).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4fbe112..d0d3c5b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2001-11-13 10:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * mml1991.el: Add coding header.
+
 2001-11-12  Simon Josefsson  <jas@extundo.com>
 
        * mml1991.el (mml1991-use, mml1991-function-alist): New variables.

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index d29328b..ac21780 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -1725,8 +1725,7 @@ increase the score of each group you read."
     "m" gnus-summary-toggle-mime
     "a" gnus-article-strip-headers-in-body ;; mnemonic: wash archive
     "p" gnus-article-verify-x-pgp-sig
-    "d" gnus-article-treat-dumbquotes
-    "s" gnus-smiley-display)
+    "d" gnus-article-treat-dumbquotes)
 
   (gnus-define-keys (gnus-summary-wash-hide-map "W" gnus-summary-wash-map)
     "a" gnus-article-hide

diff --git a/lisp/mml1991.el b/lisp/mml1991.el
index 5eb0926..696b98b 100644 (file)
--- a/lisp/mml1991.el
+++ b/lisp/mml1991.el
@@ -1,4 +1,4 @@
-;;; mml-gpg-old.el --- Old PGP message format (RFC 1991) support for MML
+;;; mml-gpg-old.el --- Old PGP message format (RFC 1991) support for MML -*- coding: iso-latin-1 -*-
 ;; Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
 
 ;; Author: Sascha Lüdecke <sascha@meta-x.de>,
@@ -24,8 +24,6 @@
 
 ;;; Commentary:
 
-;; RCS: $Id: mml1991.el,v 1.1.2.1 2001-11-13 00:03:29 yamaoka Exp $
-
 ;;; Code:
 
 (defvar mml1991-use mml2015-use

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 6d69d77..d287cc5 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,7 @@
+2001-11-13  Simon Josefsson  <jas@extundo.com>
+
+       * gnus.texi (Article Washing): Add `W s'.
+
 2001-11-12  Simon Josefsson  <jas@extundo.com>
 
        * gnus.texi (Security, Using GPG):

diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index 5e8b9b7..c367616 100644 (file)
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -7897,6 +7897,12 @@ HZ \e$B$^$?$O\e(B HZP \e$B$r=hM}$7$^$9!#\e(BHZ (\e$B$^$?$O\e(B HZP) \e$B$OCf9q8l$N5-;v$
 \e$B$N\e(B PGP \e$B$N80$O\e(B @uref{ftp://ftp.isc.org/pub/pgpcontrol/README.html} \e$B$+$iF~\e(B
 \e$B<j$9$k$3$H$,$G$-$^$9!#\e(B}
 
+@c @item W s
+@c @kindex W s (Summary)
+@c @findex gnus-summary-force-verify-and-decrypt
+@c Verify a signed (PGP, PGP/MIME or S/MIME) message
+@c (@code{gnus-summary-force-verify-and-decrypt}).
+
 @item W W H
 @kindex W W H (\e$B35N,\e(B)
 @findex gnus-article-strip-headers-from-body

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 8698151..a6217dc 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -8050,6 +8050,12 @@ public key of the maintainer to your keyring to verify the
 message.@footnote{PGP keys for many hierarchies are available at
 @uref{ftp://ftp.isc.org/pub/pgpcontrol/README.html}}
 
+@item W s
+@kindex W s (Summary)
+@findex gnus-summary-force-verify-and-decrypt
+Verify a signed (PGP, PGP/MIME or S/MIME) message
+(@code{gnus-summary-force-verify-and-decrypt}).
+
 @item W W H
 @kindex W W H (Summary)
 @findex gnus-article-strip-headers-from-body