Merge changes made in Gnus trunk.

mm-decode.el (mm-inline-media-tests): Fix typo in regexp.
auth-source.el (auth-source-netrc-parse): Use an obfuscation method which work with things that are not ASCII.

3 files changed, 12 insertions, 6 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index fa22d1a5ea1..3fdb759932f 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,12 @@
+2011-09-18  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * mm-decode.el (mm-inline-media-tests): Fix typo in regexp.
+
+2011-09-19  Julien Danjou  <julien@danjou.info>
+
+        * 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  <larsi@gnus.org>
 
         * mm-decode.el (mm-inline-media-tests): Support imagemagick images.
diff --git a/lisp/gnus/auth-source.el b/lisp/gnus/auth-source.el
index 74d69d0820c..7a05edfabc2 100644
--- a/lisp/gnus/auth-source.el
+++ b/lisp/gnus/auth-source.el
@@ -886,11 +886,8 @@ Note that the MAX parameter is used so we can exit the parse early."
             ;; (note for the irony-impaired: they are just obfuscated)
             (aput 'auth-source-netrc-cache file
                   (list :mtime (nth 5 (file-attributes file))
-                        :secret (lexical-let ((v (rot13-string
-                                                  (base64-encode-string
-                                                   (buffer-string)))))
-                                  (lambda () (base64-decode-string
-                                              (rot13-string v)))))))
+                        :secret (lexical-let ((v (mapcar '1+ (buffer-string))))
+                                  (lambda () (apply 'string (mapcar '1- v)))))))
           (goto-char (point-min))
           ;; Go through the file, line by line.
           (while (and (not (eobp))
diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el
index 6e56213c327..37ee59e9b4b 100644
--- a/lisp/gnus/mm-decode.el
+++ b/lisp/gnus/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)