Synch with Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e950db1..2fb269c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2000-11-08 19:58:58  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * mml2015.el (mml2015-gpg-decrypt-1): 
+       (mml2015-gpg-verify): buffer-string has no argument in Emacs.
+
 2000-11-08 16:37:02  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * gnus-cache.el (gnus-cache-generate-nov-databases): Reopen cache.

diff --git a/lisp/mml2015.el b/lisp/mml2015.el
index 973d50f..a571748 100644 (file)
--- a/lisp/mml2015.el
+++ b/lisp/mml2015.el
@@ -273,7 +273,8 @@
          '(t)
        (mm-set-handle-multipart-parameter 
         mm-security-handle 'gnus-details 
-        (buffer-string mml2015-result-buffer))
+        (with-current-buffer mml2015-result-buffer
+          (buffer-string)))
        nil))))
 
 (defun mml2015-gpg-decrypt (handle ctl)
@@ -313,7 +314,8 @@
          (unless (gpg-verify message signature mml2015-result-buffer)
            (mm-set-handle-multipart-parameter 
             mm-security-handle 'gnus-details 
-            (buffer-string mml2015-result-buffer))
+            (with-current-buffer mml2015-result-buffer
+              (buffer-string)))
            (mm-set-handle-multipart-parameter 
             mm-security-handle 'gnus-info "Failed")
            (throw 'error handle))))