[Emacs-diffs] /srv/bzr/emacs/trunk r105845: Merge changes made in Gnus trunk.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 105845
author: Gnus developers <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Mon 2011-09-19 22:06:57 +0000
message:
  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.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/auth-source.el
  lisp/gnus/mm-decode.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2011-09-17 12:02:10 +0000
+++ b/lisp/gnus/ChangeLog       2011-09-19 22:06:57 +0000
@@ -1,3 +1,12 @@
+2011-09-18  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * mm-decode.el (mm-inline-media-tests): Fix typo in regexp.
+
+2011-09-19  Julien Danjou  <address@hidden>
+
+       * 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  <address@hidden>
 
        * mm-decode.el (mm-inline-media-tests): Support imagemagick images.

=== modified file 'lisp/gnus/auth-source.el'
--- a/lisp/gnus/auth-source.el  2011-08-30 23:01:50 +0000
+++ b/lisp/gnus/auth-source.el  2011-09-19 22:06:57 +0000
@@ -886,11 +886,8 @@
             ;; (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))

=== modified file 'lisp/gnus/mm-decode.el'
--- a/lisp/gnus/mm-decode.el    2011-09-17 12:02:10 +0000
+++ b/lisp/gnus/mm-decode.el    2011-09-19 22:06:57 +0000
@@ -265,7 +265,7 @@
     ("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)