summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/gnus/ChangeLog5
-rw-r--r--lisp/gnus/mml.el4
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 956cc6b70c3..7e6137226b5 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/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-11 Paul Eggert <eggert@cs.ucla.edu>
* gnus-cloud.el (gnus-cloud-parse-version-1): Fix misspelling
diff --git a/lisp/gnus/mml.el b/lisp/gnus/mml.el
index 726faeed6a0..fccdf521303 100644
--- a/lisp/gnus/mml.el
+++ b/lisp/gnus/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")