diff options
| author | Joakim Verona | 2013-08-13 20:16:27 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-08-13 20:16:27 +0200 |
| commit | f0a5c7bd7d1654efded1a93b71b662d815d18ef8 (patch) | |
| tree | bd88eee45b947609040743fb00ca7104ae3689df /lisp/ChangeLog | |
| parent | a218d7fbf59ed0896f02bf50ed1702c26696cd30 (diff) | |
| parent | 21c58ae2a804b00812d3e609806326ac5d301e34 (diff) | |
| download | emacs-f0a5c7bd7d1654efded1a93b71b662d815d18ef8.tar.gz emacs-f0a5c7bd7d1654efded1a93b71b662d815d18ef8.zip | |
merge from trunk
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c6f11fec11a..17648f6a540 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,11 @@ | |||
| 1 | 2013-08-13 Lars Magne Ingebrigtsen <larsi@gnus.org> | 1 | 2013-08-13 Lars Magne Ingebrigtsen <larsi@gnus.org> |
| 2 | 2 | ||
| 3 | * net/shr.el (shr-parse-image-data): New function to grab both the | ||
| 4 | data itself and the Content-Type. | ||
| 5 | (shr-put-image): Use it. | ||
| 6 | |||
| 7 | * net/eww.el (eww-display-image): Ditto. | ||
| 8 | |||
| 3 | * image.el (image-content-type-suffixes): New variable. | 9 | * image.el (image-content-type-suffixes): New variable. |
| 4 | 10 | ||
| 5 | 2013-08-13 Fabián Ezequiel Gallina <fgallina@gnu.org> | 11 | 2013-08-13 Fabián Ezequiel Gallina <fgallina@gnu.org> |