[Emacs-diffs] emacs-24 r117527: mml: Signal error on invalid <#secure> tag

[Daiki Ueno]

------------------------------------------------------------
revno: 117527
revision-id: address@hidden
parent: address@hidden
committer: Daiki Ueno <address@hidden>
branch nick: emacs-24
timestamp: Wed 2014-10-01 11:25:15 +0900
message:
  mml: Signal error on invalid <#secure> tag
    
  * mml.el (mml-parse-1): Error out if unknown mode is specified in
  <#secure> tag (bug#18513).
modified:
  lisp/gnus/ChangeLog            changelog-20091113204419-o5vbwnq5f7feedwu-1433
  lisp/gnus/mml.el               mml.el-20091113204419-o5vbwnq5f7feedwu-1977

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2014-06-26 06:43:39 +0000
+++ b/lisp/gnus/ChangeLog       2014-10-01 02:25:15 +0000
@@ -1,3 +1,8 @@
+2014-09-29  Daiki Ueno  <address@hidden>
+
+       * mml.el (mml-parse-1): Error out if unknown mode is specified in
+       <#secure> tag (bug#18513).
+
 2014-06-26  Glenn Morris  <address@hidden>
 
        * mm-util.el (help-function-arglist): Remove outdated declaration.

=== modified file 'lisp/gnus/mml.el'
--- a/lisp/gnus/mml.el  2014-01-01 07:43:34 +0000
+++ b/lisp/gnus/mml.el  2014-10-01 02:25:15 +0000
@@ -260,7 +260,9 @@
                ((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")