[gnus git] branch master updated: m0-11-46-g8381633 =2= Rename 24.5 to 25.1 ; mml.el (mml-parse-1): Error out if unknown mode is specified in <#secure> tag (bug#18513)

       via  8381633c0d11c104699e2c5c0ec6cd370c11c2c7 (commit)
       via  af21cb72c8fc7484652000aef0534ae58e5c0c9f (commit)
      from  0fe9cacd4c2b5cc8f12f994655f90b632be452ee (commit)


- Log -----------------------------------------------------------------
commit 8381633c0d11c104699e2c5c0ec6cd370c11c2c7
Author: Stefan Monnier <[email protected]>
Date:   Mon Sep 29 22:14:38 2014 +0000

    Rename 24.5 to 25.1
    
    gnus-art.el (gnus-mime-display-attachment-buttons-in-header):
    gnus-fun.el (gnus-x-face-omit-files, gnus-face-directory)
    (gnus-face-omit-files):
    message.el (message-forward-included-headers):
    mml2015.el (mml2015-display-key-image): Bump Emacs version.

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index d55c703..8444507 100644
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -5984,7 +5984,7 @@ Since MIME attachments tend to be put at the end of an article, we may
 overlook them if there is a huge body.  This option offers you a copy
 of all non-inlinable MIME parts as buttons shown in front of an article.
 If nil, don't show those extra buttons."
-  :version "24.5"
+  :version "25.1"
   :group 'gnus-article-mime
   :type 'boolean)
 
diff --git a/lisp/gnus-fun.el b/lisp/gnus-fun.el
index f917737..8d08cd6 100644
--- a/lisp/gnus-fun.el
+++ b/lisp/gnus-fun.el
@@ -42,19 +42,19 @@
 
 (defcustom gnus-x-face-omit-files nil
   "Regexp to match faces in `gnus-x-face-directory' to be omitted."
-  :version "24.5"
+  :version "25.1"
   :group 'gnus-fun
   :type 'string)
 
 (defcustom gnus-face-directory (expand-file-name "faces" gnus-directory)
   "*Directory where Face PNG files are stored."
-  :version "24.5"
+  :version "25.1"
   :group 'gnus-fun
   :type 'directory)
 
 (defcustom gnus-face-omit-files nil
   "Regexp to match faces in `gnus-face-directory' to be omitted."
-  :version "24.5"
+  :version "25.1"
   :group 'gnus-fun
   :type 'string)
 
diff --git a/lisp/message.el b/lisp/message.el
index 424a56e..847652f 100644
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -627,7 +627,7 @@ This may also be a list of regexps."
   "If non-nil, delete non-matching headers when forwarding a message.
 Only headers that match this regexp will be included.  This
 variable should be a regexp or a list of regexps."
-  :version "24.5"
+  :version "25.1"
   :group 'message-forwarding
   :type '(repeat :value-to-internal (lambda (widget value)
 				      (custom-split-regexp-maybe value))
diff --git a/lisp/mml2015.el b/lisp/mml2015.el
index 74290f4..941b5ec 100644
--- a/lisp/mml2015.el
+++ b/lisp/mml2015.el
@@ -149,7 +149,7 @@ If set, it overrides the setting of `mml2015-sign-with-sender'."
 
 (defcustom mml2015-display-key-image t
   "If t, try to display key images."
-  :version "24.5"
+  :version "25.1"
   :group 'mime-security
   :type 'boolean)
 

commit af21cb72c8fc7484652000aef0534ae58e5c0c9f
Author: Daiki Ueno <[email protected]>
Date:   Mon Sep 29 22:08:18 2014 +0000

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 23eed71..e76cc2b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-09-29  Daiki Ueno  <[email protected]>
+
+	* mml.el (mml-parse-1): Error out if unknown mode is specified in
+	<#secure> tag (bug#18513).
+
 2014-09-27  Katsumi Yamaoka  <[email protected]>
 
 	* parse-time.el: Require cl when compiling.
diff --git a/lisp/mml.el b/lisp/mml.el
index 726faee..fccdf52 100644
--- 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")

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog   |    5 +++++
 lisp/gnus-art.el |    2 +-
 lisp/gnus-fun.el |    6 +++---
 lisp/message.el  |    2 +-
 lisp/mml.el      |    4 +++-
 lisp/mml2015.el  |    2 +-
 6 files changed, 14 insertions(+), 7 deletions(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project