* (mime-mc-pgp50-sign-region, mime-mc-gpg-sign-region): Don't deactivate

passwd during detecting the value of `micalg' even if `mc-passwd-timeout'
is set to nil.
(mime-mc-gpg-process-region): Print this function name for debugging.

diff --git a/ChangeLog b/ChangeLog
index 8cee2fd..b1a697f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+1999-04-13  Katsumi Yamaoka   <yamaoka@jpl.org>
+
+       * mime-mc.el (mime-mc-pgp50-sign-region, mime-mc-gpg-sign-region):
+       Don't deactivate passwd during detecting the value of `micalg' even
+       if `mc-passwd-timeout' is set to nil.
+       (mime-mc-gpg-process-region): Print this function name for
+       debugging.
+
 1999-04-12  Katsumi Yamaoka   <yamaoka@jpl.org>
 
        * mime-pgp.el (mime-pgp-check-signature): Return nil if neither bad

diff --git a/mime-mc.el b/mime-mc.el
index be10e02..2ca0c92 100644 (file)
--- a/mime-mc.el
+++ b/mime-mc.el
@@ -229,7 +229,7 @@ optional argument COMMENT if it is specified."
        proc rc status parser-result
        )
     (mc-gpg-debug-print (format 
-                        "(mc-gpg-process-region beg=%s end=%s passwd=%s program=%s args=%s parser=%s bufferdummy=%s boundary=%s comment=%s)"
+                        "(mime-mc-gpg-process-region beg=%s end=%s passwd=%s program=%s args=%s parser=%s bufferdummy=%s boundary=%s comment=%s)"
                         beg end passwd program args parser bufferdummy
                         boundary comment))
     (setq stderr-tempfilename 
@@ -419,12 +419,13 @@ Content-Transfer-Encoding: 7bit
              (with-temp-buffer
                (message "Detecting the value of `micalg'...")
                (insert "\n")
-               (mime-mc-gpg-process-region
-                1 2 passwd pgp-path
-                (list "--clearsign" "--armor" "--batch" "--textmode"
-                      "--verbose" "--local-user" (cdr key))
-                parser buffer nil
-                )
+               (let ((mc-passwd-timeout 60)) ;; Don't deactivate passwd.
+                 (mime-mc-gpg-process-region
+                  1 2 passwd pgp-path
+                  (list "--clearsign" "--armor" "--batch" "--textmode"
+                        "--verbose" "--local-user" (cdr key))
+                  parser buffer nil
+                  ))
                (std11-narrow-to-header)
                (setq micalg
                      (downcase (or (std11-fetch-field "Hash") "md5"))
@@ -694,11 +695,13 @@ Content-Transfer-Encoding: 7bit
        (with-temp-buffer
          (message "Detecting the value of `micalg'...")
          (insert "\n")
-         (mime-mc-pgp50-process-region
-          1 2 passwd pgp-path
-          (list "-fat" "+verbose=1" "+language=us" "+clearsig=on"
-                "+batchmode" "-u" (cdr key))
-          (function mc-pgp50-sign-parser) buffer nil)
+         (let ((mc-passwd-timeout 60)) ;; Don't deactivate passwd.
+           (mime-mc-pgp50-process-region
+            1 2 passwd pgp-path
+            (list "-fat" "+verbose=1" "+language=us" "+clearsig=on"
+                  "+batchmode" "-u" (cdr key))
+            (function mc-pgp50-sign-parser) buffer nil
+            ))
          (std11-narrow-to-header)
          (setq micalg (downcase (or (std11-fetch-field "Hash") "md5")))
          (set-alist 'mime-mc-micalg-alist (cdr key) micalg)