2000-12-03 12:00:00 ShengHuo ZHU <zsh@cs.rochester.edu>

	* mml2015.el (mml2015-fix-micalg): Alg might be nil.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ca6ee7f..f7eb440 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2000-12-03 12:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * mml2015.el (mml2015-fix-micalg): Alg might be nil.
+
 2000-12-01  Christopher Splinter <chris@splinter.inka.de>
 
        * gnus-sum.el (gnus-summary-limit-to-age): Fix typo.

diff --git a/lisp/mml2015.el b/lisp/mml2015.el
index b682d89..126f647 100644 (file)
--- a/lisp/mml2015.el
+++ b/lisp/mml2015.el
@@ -131,10 +131,10 @@
        mm-security-handle 'gnus-info "Failed"))))
 
 (defun mml2015-fix-micalg (alg)
-  (upcase
-   (if (and alg (string-match "^pgp-" alg))
-       (substring alg (match-end 0))
-     alg)))
+  (and alg
+       (upcase (if (string-match "^pgp-" alg)
+                  (substring alg (match-end 0))
+                alg))))
 
 (defun mml2015-mailcrypt-verify (handle ctl)
   (catch 'error