[gnus git] branch master updated: n0-17-303-ga4d795d =2= Merge ; * mm-decode.el (mm-inline-media-tests): Fix typo in regexp.

       via  a4d795dc3664de763b2c9080235c0abfe45ef294 (commit)
       via  5c15f8a1686eeb701e56e61ae50050359b5dd408 (commit)
      from  3192fb6a275b062a2cb55a72997e704eb4805da7 (commit)


- Log -----------------------------------------------------------------
commit a4d795dc3664de763b2c9080235c0abfe45ef294
Merge: 5c15f8a 3192fb6
Author: Lars Magne Ingebrigtsen <[email protected]>
Date:   Mon Sep 19 20:39:57 2011 +0200

    Merge

diff --cc lisp/ChangeLog
index 4c78c9d,77cbdc0..ac6528d
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,7 -1,8 +1,12 @@@
 +2011-09-18  Lars Magne Ingebrigtsen  <[email protected]>
 +
 +	* mm-decode.el (mm-inline-media-tests): Fix typo in regexp.
 +
+ 2011-09-19  Julien Danjou  <[email protected]>
+ 
+ 	* auth-source.el (auth-source-netrc-parse): Use an obfuscation method
+ 	which work with things that are not ASCII.
+ 
  2011-09-17  Lars Magne Ingebrigtsen  <[email protected]>
  
  	* mm-decode.el (mm-inline-media-tests): Support imagemagick images.

commit 5c15f8a1686eeb701e56e61ae50050359b5dd408
Author: Lars Magne Ingebrigtsen <[email protected]>
Date:   Sun Sep 18 09:46:23 2011 +0200

    * mm-decode.el (mm-inline-media-tests): Fix typo in regexp.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2e1fc59..4c78c9d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2011-09-18  Lars Magne Ingebrigtsen  <[email protected]>
+
+	* mm-decode.el (mm-inline-media-tests): Fix typo in regexp.
+
 2011-09-17  Lars Magne Ingebrigtsen  <[email protected]>
 
 	* mm-decode.el (mm-inline-media-tests): Support imagemagick images.
diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el
index 6e56213..37ee59e 100644
--- a/lisp/mm-decode.el
+++ b/lisp/mm-decode.el
@@ -265,7 +265,7 @@ before the external MIME handler is invoked."
     ("multipart/alternative" ignore identity)
     ("multipart/mixed" ignore identity)
     ("multipart/related" ignore identity)
-    ("image/*"
+    ("image/.*"
      mm-inline-image
      (lambda (handle)
        (and (mm-valid-image-format-p 'imagemagick)

-----------------------------------------------------------------------
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    |    4 ++++
 lisp/mm-decode.el |    2 +-
 2 files changed, 5 insertions(+), 1 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