Synch with Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 28a157d..94b638c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2000-11-06 22:06:44  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * mm-decode.el (mm-possibly-verify-or-decrypt): Fix.  
+       * gnus-art.el (gnus-article-encrypt-body): Rename and support prefix
+       argument.
+
 2000-11-06 19:10:14  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * rfc2231.el (rfc2231-encode-string): Use us-ascii if charset is nil.

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index ac06878..84fa1bd 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -1016,7 +1016,9 @@ See the manual for details."
 (defvar gnus-article-encrypt-protocol-alist
   '(("PGP" . mml2015-self-encrypt)))
 
-(defcustom gnus-article-encrypt-protocol nil
+;; Set to nil if more than one protocol added to
+;; gnus-article-encrypt-protocol-alist.
+(defcustom gnus-article-encrypt-protocol "PGP"
   "The protocol used for encrypt articles.
 It is a string, such as \"PGP\". If nil, ask user."
   :type 'string
@@ -5455,73 +5457,77 @@ For example:
    (t
     (error "%S is not a valid value" val))))
 
-(defun gnus-article-encrypt (protocol)
-  "Replace the article with encrypted one."
+(defun gnus-article-encrypt-body (protocol &optional n)
+  "Encrypt the article body."
   (interactive 
    (list
     (or gnus-article-encrypt-protocol
        (completing-read "Encrypt protocol: "
                         gnus-article-encrypt-protocol-alist 
-                        nil t))))
+                        nil t))
+    current-prefix-arg))
   (let ((func (cdr (assoc protocol gnus-article-encrypt-protocol-alist))))
     (unless func
       (error (format "Can't find the encrypt protocol %s" protocol)))
     (if (equal gnus-newsgroup-name "nndraft:drafts")
        (error "Can't encrypt the article in group nndraft:drafts."))
-    (save-excursion
-      (set-buffer gnus-summary-buffer)
-      (let ((mail-parse-charset gnus-newsgroup-charset)
-           (mail-parse-ignored-charsets gnus-newsgroup-ignored-charsets)
-           (summary-buffer gnus-summary-buffer)
-           references point)
-       (gnus-set-global-variables)
-       (when (gnus-group-read-only-p)
-         (error "The current newsgroup does not support article encrypt"))
-       (gnus-summary-show-article t)
-       (setq references
+    (if (equal gnus-newsgroup-name "nndraft:queue")
+       (error "Don't encrypt the article in group nndraft:queue."))
+    (gnus-summary-iterate n
+      (save-excursion
+       (set-buffer gnus-summary-buffer)
+       (let ((mail-parse-charset gnus-newsgroup-charset)
+             (mail-parse-ignored-charsets gnus-newsgroup-ignored-charsets)
+             (summary-buffer gnus-summary-buffer)
+             references point)
+         (gnus-set-global-variables)
+         (when (gnus-group-read-only-p)
+           (error "The current newsgroup does not support article encrypt"))
+         (gnus-summary-show-article t)
+         (setq references
              (or (mail-header-references gnus-current-headers) ""))
-       (set-buffer gnus-article-buffer)
-       (let* ((buffer-read-only nil)
-              (headers
-               (mapcar (lambda (field)
-                         (and (save-restriction 
-                                (message-narrow-to-head)
-                                (goto-char (point-min))
-                                (search-forward field nil t))
-                              (prog2
-                                  (message-narrow-to-field)
-                                  (buffer-substring (point-min) (point-max))
-                                (delete-region (point-min) (point-max))
-                                (widen))))
-                       '("Content-Type:" "Content-Transfer-Encoding:"
-                         "Content-Disposition:"))))
-         (message-narrow-to-head)
-         (message-remove-header "MIME-Version")
-         (goto-char (point-max))
-         (setq point (point))
-         (insert (apply 'concat headers))
-         (widen)
-         (narrow-to-region point (point-max))
-         (let ((message-options message-options))
-           (message-options-set 'message-sender user-mail-address)
-           (message-options-set 'message-recipients user-mail-address)
-           (message-options-set 'message-sign-encrypt 'not)
-           (funcall func))
-         (goto-char (point-min))
-         (insert "MIME-Version: 1.0\n")
-         (widen)
-         (gnus-summary-edit-article-done
-          references nil summary-buffer t))
-       (when gnus-keep-backlog
-         (gnus-backlog-remove-article
-          (car gnus-article-current) (cdr gnus-article-current)))
-       (save-excursion
-         (when (get-buffer gnus-original-article-buffer)
-           (set-buffer gnus-original-article-buffer)
-           (setq gnus-original-article nil)))
-       (when gnus-use-cache
-         (gnus-cache-update-article
-          (car gnus-article-current) (cdr gnus-article-current)))))))
+         (set-buffer gnus-article-buffer)
+         (let* ((buffer-read-only nil)
+                (headers
+                 (mapcar (lambda (field)
+                           (and (save-restriction 
+                                  (message-narrow-to-head)
+                                  (goto-char (point-min))
+                                  (search-forward field nil t))
+                                (prog2
+                                    (message-narrow-to-field)
+                                    (buffer-substring (point-min) (point-max))
+                                  (delete-region (point-min) (point-max))
+                                  (widen))))
+                         '("Content-Type:" "Content-Transfer-Encoding:"
+                           "Content-Disposition:"))))
+           (message-narrow-to-head)
+           (message-remove-header "MIME-Version")
+           (goto-char (point-max))
+           (setq point (point))
+           (insert (apply 'concat headers))
+           (widen)
+           (narrow-to-region point (point-max))
+           (let ((message-options message-options))
+             (message-options-set 'message-sender user-mail-address)
+             (message-options-set 'message-recipients user-mail-address)
+             (message-options-set 'message-sign-encrypt 'not)
+             (funcall func))
+           (goto-char (point-min))
+           (insert "MIME-Version: 1.0\n")
+           (widen)
+           (gnus-summary-edit-article-done
+            references nil summary-buffer t))
+         (when gnus-keep-backlog
+           (gnus-backlog-remove-article
+            (car gnus-article-current) (cdr gnus-article-current)))
+         (save-excursion
+           (when (get-buffer gnus-original-article-buffer)
+             (set-buffer gnus-original-article-buffer)
+             (setq gnus-original-article nil)))
+         (when gnus-use-cache
+           (gnus-cache-update-article
+            (car gnus-article-current) (cdr gnus-article-current))))))))
 
 
 ;;; @ for mime-view

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 71a842d..affdb84 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -1671,7 +1671,7 @@ increase the score of each group you read."
     "c" gnus-article-copy-part
     "C" gnus-article-view-part-as-charset
     "e" gnus-article-externalize-part
-    "E" gnus-article-encrypt
+    "E" gnus-article-encrypt-body
     "i" gnus-article-inline-part
     "|" gnus-article-pipe-part))
 

diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el
index 9b48183..344d05e 100644 (file)
--- a/lisp/mm-decode.el
+++ b/lisp/mm-decode.el
@@ -1001,12 +1001,15 @@ If RECURSIVE, search recursively."
                      protocols nil)
              (setq protocols (cdr protocols))))))
       (setq func (nth 1 (assoc protocol mm-verify-function-alist)))
-      (setq functest (nth 3 (assoc protocol mm-verify-function-alist)))
       (if (cond
           ((eq mm-verify-option 'never) nil)
           ((eq mm-verify-option 'always) t)
           ((eq mm-verify-option 'known) 
-           (and func (funcall functest parts ctl)))
+           (and func 
+                (or (not (setq functest 
+                               (nth 3 (assoc protocol 
+                                             mm-verify-function-alist))))
+                    (funcall functest parts ctl))))
           (t (y-or-n-p
               (format "Verify signed (%s) part? "
                       (or (nth 2 (assoc protocol mm-verify-function-alist))
@@ -1030,12 +1033,15 @@ If RECURSIVE, search recursively."
                      parts nil)
              (setq parts (cdr parts))))))
       (setq func (nth 1 (assoc protocol mm-decrypt-function-alist)))
-      (setq functest (nth 3 (assoc protocol mm-decrypt-function-alist)))
       (if (cond
           ((eq mm-decrypt-option 'never) nil)
           ((eq mm-decrypt-option 'always) t)
           ((eq mm-decrypt-option 'known)
-           (and func (funcall functest parts ctl)))
+           (and func 
+                (or (not (setq functest 
+                               (nth 3 (assoc protocol 
+                                             mm-decrypt-function-alist))))
+                    (funcall functest parts ctl))))
           (t (y-or-n-p 
               (format "Decrypt (%s) part? "
                       (or (nth 2 (assoc protocol mm-decrypt-function-alist))