diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/net/eww.el | 19 |
2 files changed, 13 insertions, 11 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 85f6b3b805f..375dd080b0f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-12-01 Ivan Shmakov <ivan@siamics.net> + + * net/eww.el (eww-render): Call `eww-after-render-hook' in the + correct buffer (bug#19225). + 2014-12-01 Lars Magne Ingebrigtsen <larsi@gnus.org> * net/nsm.el (network-security-level): Change the default to `medium'. diff --git a/lisp/net/eww.el b/lisp/net/eww.el index 70427c16fdb..73abd26d8c5 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -309,14 +309,14 @@ See the `eww-search-prefix' variable for the search engine used." ((equal (car content-type) "application/pdf") (eww-display-pdf)) ((string-match-p "\\`image/" (car content-type)) - (eww-display-image buffer) - (eww-update-header-line-format)) + (eww-display-image buffer)) (t - (eww-display-raw buffer encode) - (eww-update-header-line-format))) - (plist-put eww-data :url url) - (setq eww-history-position 0) - (run-hooks 'eww-after-render-hook)) + (eww-display-raw buffer encode))) + (with-current-buffer buffer + (plist-put eww-data :url url) + (eww-update-header-line-format) + (setq eww-history-position 0) + (run-hooks 'eww-after-render-hook))) (kill-buffer data-buffer)))) (defun eww-parse-headers () @@ -404,10 +404,7 @@ See the `eww-search-prefix' variable for the search engine used." (while (and (not (eobp)) (get-text-property (point) 'eww-form)) (forward-line 1))))) - (plist-put eww-data :url url) - (setq eww-history-position 0) - (eww-size-text-inputs) - (eww-update-header-line-format)))) + (eww-size-text-inputs)))) (defun eww-handle-link (dom) (let* ((rel (dom-attr dom 'rel)) |