mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2025-01-16 17:19:41 +00:00
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.
This commit is contained in:
parent
e24e27be18
commit
a3ddc4d9c6
@ -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.
|
||||
|
@ -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))
|
||||
|
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user