Synch with Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 25ccf85..395a0a1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2000-11-19 23:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * mm-decode.el (mm-decrypt-option): Doc typo.
+
+       * gnus-art.el (gnus-article-read-summary-keys): lookup-key may
+       return a number.
+
 2000-11-19 21:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * message.el (message-newline-and-reformat): Typo.

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 7944bb8..0dc292b 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -4398,26 +4398,28 @@ Argument LINES specifies lines to be scrolled down."
           (switch-to-buffer summary 'norecord))
         (setq in-buffer (current-buffer))
         ;; We disable the pick minor mode commands.
-        (if (setq func (let (gnus-pick-mode)
-                         (lookup-key (current-local-map) keys)))
+        (if (and (setq func (let (gnus-pick-mode)
+                             (lookup-key (current-local-map) keys)))
+                (functionp func))
             (progn
               (call-interactively func)
-              (setq new-sum-point (point)))
-          (ding))
-        (when (eq in-buffer (current-buffer))
-          (setq selected (gnus-summary-select-article))
-          (set-buffer obuf)
-          (unless not-restore-window
-            (set-window-configuration owin))
-          (when (eq selected 'old)
-           (article-goto-body)
-            (set-window-start (get-buffer-window (current-buffer))
-                              1)
-            (set-window-point (get-buffer-window (current-buffer))
-                              (point)))
-          (let ((win (get-buffer-window gnus-article-current-summary)))
-            (when win
-              (set-window-point win new-sum-point))))))))
+              (setq new-sum-point (point))
+             (when (eq in-buffer (current-buffer))
+               (setq selected (gnus-summary-select-article))
+               (set-buffer obuf)
+               (unless not-restore-window
+                 (set-window-configuration owin))
+               (when (eq selected 'old)
+                 (article-goto-body)
+                 (set-window-start (get-buffer-window (current-buffer))
+                                   1)
+                 (set-window-point (get-buffer-window (current-buffer))
+                                   (point)))
+               (let ((win (get-buffer-window gnus-article-current-summary)))
+                 (when win
+                   (set-window-point win new-sum-point))))    )
+         (switch-to-buffer gnus-article-buffer)
+          (ding))))))
 
 (defun gnus-article-hide (&optional arg force)
   "Hide all the gruft in the current article.

diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el
index 30be82f..18fe126 100644 (file)
--- a/lisp/mm-decode.el
+++ b/lisp/mm-decode.el
@@ -269,7 +269,7 @@ to:
      mm-uu-pgp-encrypted-test)))
 
 (defcustom mm-decrypt-option nil
-  "Option of decrypting signed parts.
+  "Option of decrypting encrypted parts.
 `never', not decrypt; `always', always decrypt; 
 `known', only decrypt known protocols. Otherwise, ask user."
   :type '(choice (item always)

diff --git a/texi/ChangeLog b/texi/ChangeLog
index f94f32a..66a51ae 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,7 @@
+2000-11-20 00:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * gnus.texi: Add.
+
 2000-11-12  Florian Weimer  <fw@deneb.enyo.de>
 
        * message.texi (Security): Fixed typo, change "PGP" to "OpenPGP".

diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index 7104302..55e105b 100644 (file)
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -565,6 +565,7 @@ The Summary Buffer
 * Exiting the Summary Buffer:: \e$B%0%k!<%W%P%C%U%!$KLa$k\e(B
 * Crosspost Handling::         \e$B%/%m%9%]%9%H$5$l$?5-;v$,$I$N$h$&$K07$o$l$k$+\e(B
 * Duplicate Suppression::      \e$B%/%m%9%]%9%H$N07$$$K<:GT$7$?$H$-$NBeBX<jCJ\e(B
+@c * Security::                    Decrypt and Verify.
 
 Summary Buffer Format
 
@@ -2844,6 +2845,23 @@ kill \e$B$5$l$?%0%k!<%W$rA4$FI=<($7$^$9\e(B (@code{gnus-group-list-killed})\e$B!#@\
 @findex gnus-group-list-dormant
 \e$BJ]N15-;v$r;}$D%0%k!<%W$rA4$FI=<($9$k\e(B (@code{gnus-group-list-dormant})\e$B!#\e(B
 
+@item A /
+@kindex A / (Group)
+@findex gnus-group-list-limit
+\e$B8=:_$NA*Br$5$l$?HO0O$K8BDj$7$?%0%k!<%W$rI=<($9\e(B
+\e$B$k\e(B (@code{gnus-group-list-limit})\e$B!#\e(B
+
+@item A f
+@kindex A f (Group)
+@findex gnus-group-list-flush
+\e$B8=:_$NA*Br$5$l$?%0%k!<%W$r=q$-=P$9\e(B (@code{gnus-group-list-flush})\e$B!#\e(B
+
+@item A p
+@kindex A p (Group)
+@findex gnus-group-list-plus
+\e$B8=:_$NA*Br$5$l$?%0%k!<%W$r2C$($?%0%k!<%W$rI=<($9\e(B
+\e$B$k\e(B (@code{gnus-group-list-plus})\e$B!#\e(B
+
 @end table
 
 @vindex gnus-permanently-visible-groups
@@ -3872,6 +3890,7 @@ Gnus \e$B$K!"$"$J$?$,:G8e$K$$$D%0%k!<%W$rFI$s$@$+$r5-O?$5$;$k$HJXMx$+$b$7$l\e(B
 * Exiting the Summary Buffer:: \e$B%0%k!<%W%P%C%U%!$KLa$k\e(B
 * Crosspost Handling::         \e$B%/%m%9%]%9%H$5$l$?5-;v$,$I$N$h$&$K07$o$l$k$+\e(B
 * Duplicate Suppression::      \e$B%/%m%9%]%9%H$N07$$$K<:GT$7$?$H$-$NBeBX<jCJ\e(B
+@c * Security::                    Decrypt and Verify.
 @end menu
 
 @node Summary Buffer Format
@@ -8603,6 +8622,36 @@ Gnus \e$B$K$$$D$G$b@5$7$$\e(B @code{Xref} \e$B$r<hF@$9$k$h$&$K$5$;$?$$$N$G$"$l$P!"\e
 @code{gnus-save-duplicate-list} \e$B$r\e(B @code{nil} \e$B$K@_Dj$9$k$Y$-$G$"$k$H$$$&\e(B
 \e$B;v$K$J$j$^$9!#$&!<$`!#;d$O$"$J$?$,$I$&$9$k$+$KG$$;$?$$!"$H;W$$$^$9!#\e(B
 
+@ignore
+@node Security
+@section Security
+
+Gnus is able to verify PGP or S/MIME signed messages or decrypt PGP
+encrypted messages.
+
+@enumerate
+@item 
+To verify or decrypt PGP messages, you have to install mailcrypt or
+gpg.el.
+
+@end enumerate
+
+@table @code
+@item mm-verify-option
+@vindex mm-verify-option
+Option of verifying signed parts.  @code{never}, not verify;
+@code{always}, always verify; @code{known}, only verify known
+protocols. Otherwise, ask user.
+
+@item mm-decrypt-option
+@vindex mm-decrypt-option
+Option of decrypting encrypted parts.  @code{never}, not verify;
+@code{always}, always verify; @code{known}, only verify known
+protocols. Otherwise, ask user.
+
+@end table
+@end ignore
+
 @node The Article Buffer
 @chapter \e$B5-;v%P%C%U%!\e(B
 @cindex article buffer
@@ -11973,6 +12022,10 @@ rmail box \e$B$N$?$a$N%"%/%F%#%V%U%!%$%k$NL>A0!#\e(B
 \e$B4X?t$OJL$N$H$3$m$K%a%C%;!<%8$r%3%T!<$7$?$j!">C5n$9$k$^$($K2?$i$+$N>pJs$r\e(B
 \e$B<h$j=P$9$?$a$K;H$C$?$j$9$k$3$H$,$G$-$^$9!#\e(B
 
+@item nnfolder-nov-is-evil
+@vindex nnfolder-nov-is-evil
+\e$B$b$7Hs\e(B@code{nil}\e$B$J$i!"$3$N%P%C%/%(%s%I$O\e(B @sc{nov} \e$B%U%!%$%k$rL5;k$7$^$9!#\e(B
+
 @end table
 
 @findex nnfolder-generate-active-file

diff --git a/texi/gnus.texi b/texi/gnus.texi
index c53aff6..5db2627 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -510,6 +510,7 @@ The Summary Buffer
 * Exiting the Summary Buffer::  Returning to the Group buffer.
 * Crosspost Handling::          How crossposted articles are dealt with.
 * Duplicate Suppression::       An alternative when crosspost handling fails.
+* Security::                    Decrypt and Verify.
 
 Summary Buffer Format
 
@@ -2811,6 +2812,22 @@ List all groups with cached articles (@code{gnus-group-list-cached}).
 @findex gnus-group-list-dormant
 List all groups with dormant articles (@code{gnus-group-list-dormant}).
 
+@item A /
+@kindex A / (Group)
+@findex gnus-group-list-limit
+List groups limited within the current selection
+(@code{gnus-group-list-limit}).
+
+@item A f
+@kindex A f (Group)
+@findex gnus-group-list-flush
+Flush groups from the current selection (@code{gnus-group-list-flush}).
+
+@item A p
+@kindex A p (Group)
+@findex gnus-group-list-plus
+List groups plus the current selection (@code{gnus-group-list-plus}).
+
 @end table
 
 @vindex gnus-permanently-visible-groups
@@ -3849,6 +3866,7 @@ You can have as many summary buffers open as you wish.
 * Exiting the Summary Buffer::  Returning to the Group buffer.
 * Crosspost Handling::          How crossposted articles are dealt with.
 * Duplicate Suppression::       An alternative when crosspost handling fails.
+* Security::                    Decrypt and Verify.
 @end menu
 
 
@@ -9016,6 +9034,33 @@ so that means that if you stop and start gnus often, you should set
 @code{gnus-save-duplicate-list} to @code{nil}.  Uhm.  I'll leave this up
 to you to figure out, I think.
 
+@node Security
+@section Security
+
+Gnus is able to verify PGP or S/MIME signed messages or decrypt PGP
+encrypted messages.
+
+@enumerate
+@item 
+To verify or decrypt PGP messages, you have to install mailcrypt or
+gpg.el.
+
+@end enumerate
+
+@table @code
+@item mm-verify-option
+@vindex mm-verify-option
+Option of verifying signed parts.  @code{never}, not verify;
+@code{always}, always verify; @code{known}, only verify known
+protocols. Otherwise, ask user.
+
+@item mm-decrypt-option
+@vindex mm-decrypt-option
+Option of decrypting encrypted parts.  @code{never}, not verify;
+@code{always}, always verify; @code{known}, only verify known
+protocols. Otherwise, ask user.
+
+@end table
 
 @node The Article Buffer
 @chapter The Article Buffer
@@ -12560,6 +12605,10 @@ Hook run in a buffer narrowed to the message that is to be deleted.
 This function can be used to copy the message to somewhere else, or to
 extract some information from it before removing it.
 
+@item nnfolder-nov-is-evil
+@vindex nnfolder-nov-is-evil
+If non-@code{nil}, this backend will ignore any @sc{nov} files.
+
 @end table