mml.el (mml-parse-1): Error out if unknown mode is specified in <#secure> tag (bug...

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 23eed71..e76cc2b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-09-29  Daiki Ueno  <ueno@gnu.org>
+
+       * mml.el (mml-parse-1): Error out if unknown mode is specified in
+       <#secure> tag (bug#18513).
+
 2014-09-27  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * parse-time.el: Require cl when compiling.

diff --git a/lisp/mml.el b/lisp/mml.el
index 726faee..fccdf52 100644 (file)
--- a/lisp/mml.el
+++ b/lisp/mml.el
@@ -257,7 +257,9 @@ part.  This is for the internal use, you should never modify the value.")
                ((string= mode "encrypt")
                 (setq tags (list "encrypt" method)))
                ((string= mode "signencrypt")
-                (setq tags (list "sign" method "encrypt" method))))
+                (setq tags (list "sign" method "encrypt" method)))
+               (t
+                (error "Unknown secure mode %s" mode)))
          (eval `(mml-insert-tag ,secure-mode
                                 ,@tags
                                 ,(if keyfile "keyfile")