aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKatsumi Yamaoka2013-12-03 04:54:17 +0000
committerKatsumi Yamaoka2013-12-03 04:54:17 +0000
commit39fa32d6359c8292dd91ce1c58da1aa3f8668bd8 (patch)
tree327eff527ac68428946a870737a073423ef4e624
parent25636e136267379f6b32b8dff712f72438cbec35 (diff)
downloademacs-39fa32d6359c8292dd91ce1c58da1aa3f8668bd8.tar.gz
emacs-39fa32d6359c8292dd91ce1c58da1aa3f8668bd8.zip
lisp/net/eww.el (eww-render): Don't pass arg to eww-display-image
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/net/eww.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 42802fd43f4..610ac93b035 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12013-12-03 Katsumi Yamaoka <yamaoka@jpl.org>
2
3 * net/eww.el (eww-render): Don't pass arg to eww-display-image.
4
12013-12-03 Juri Linkov <juri@jurta.org> 52013-12-03 Juri Linkov <juri@jurta.org>
2 6
3 * progmodes/compile.el (compilation-start): Rename window alist 7 * progmodes/compile.el (compilation-start): Rename window alist
diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index 461236f04f6..6c6ef8a20aa 100644
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -197,7 +197,7 @@ word(s) will be searched for via `eww-search-prefix'."
197 ((equal (car content-type) "text/html") 197 ((equal (car content-type) "text/html")
198 (eww-display-html charset url nil point)) 198 (eww-display-html charset url nil point))
199 ((string-match-p "\\`image/" (car content-type)) 199 ((string-match-p "\\`image/" (car content-type))
200 (eww-display-image url) 200 (eww-display-image)
201 (eww-update-header-line-format)) 201 (eww-update-header-line-format))
202 (t 202 (t
203 (eww-display-raw) 203 (eww-display-raw)