Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5afc43d..7ede60f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,18 @@
+2001-03-18 23:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+       
+       * gnus-sum.el (gnus-summary-show-all-headers):
+       gnus-article-show-all-headers is broken. Use
+       gnus-summary-toggle-header instead.
+       
+       * mml2015.el (mml2015-gpg-extract-from): No error.
+
+2001-03-18 23:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+       From Bj\e,Ax\e(Brn Mork <bmork@dod.no>.
+
+       * mml2015.el (mml2015-gpg-extract-from): New function.
+       (mml2015-gpg-verify): Use it.
+       (mml2015-gpg-clear-verify): Use it.
+
 2001-03-17 10:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * message.el (message-setup-fill-variables): Use

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index b4100d5..4f5f4b8 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -7767,7 +7767,7 @@ If ARG is a negative number, hide the unwanted header lines."
 (defun gnus-summary-show-all-headers ()
   "Make all header lines visible."
   (interactive)
-  (gnus-article-show-all-headers))
+  (gnus-summary-toggle-header 1))
 
 (defun gnus-summary-toggle-mime (&optional arg)
   "Toggle MIME processing.

diff --git a/lisp/mml2015.el b/lisp/mml2015.el
index 8a56946..4f83483 100644 (file)
--- a/lisp/mml2015.el
+++ b/lisp/mml2015.el
@@ -334,6 +334,12 @@
       (mm-set-handle-multipart-parameter
        mm-security-handle 'gnus-info "Failed"))))
 
+(defun mml2015-gpg-extract-from ()
+  (goto-char (point-min))
+  (if (re-search-forward "^gpg: Good signature from \"\\(.*\\)\"$" nil t)
+      (match-string 1)
+    "From unknown user"))
+
 (defun mml2015-gpg-verify (handle ctl)
   (catch 'error
     (let (part message signature)
@@ -375,7 +381,9 @@
             mm-security-handle 'gnus-info "Failed")
            (throw 'error handle)))
        (mm-set-handle-multipart-parameter
-        mm-security-handle 'gnus-info "OK"))
+        mm-security-handle 'gnus-info 
+        (with-current-buffer mml2015-result-buffer 
+          (mml2015-gpg-extract-from))))
       handle)))
 
 (defun mml2015-gpg-clear-verify ()
@@ -395,7 +403,9 @@
          mm-security-handle 'gnus-details "Quit.")
         nil))
       (mm-set-handle-multipart-parameter
-       mm-security-handle 'gnus-info "OK")
+       mm-security-handle 'gnus-info 
+       (with-current-buffer mml2015-result-buffer 
+        (mml2015-gpg-extract-from)))
     (mm-set-handle-multipart-parameter
      mm-security-handle 'gnus-info "Failed")))