From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Ivan Shmakov Newsgroups: gmane.emacs.bugs Subject: bug#19225: eww-render: runs eww-after-render-hook in the (temporary) data buffer Date: Sun, 30 Nov 2014 10:45:46 +0000 Message-ID: <87lhmtnezp.fsf@violet.siamics.net> References: <87fvpmwint.fsf@violet.siamics.net> <87eh56dkdo.fsf@flea.lifelogs.com> <87d2knaf08.fsf@flea.lifelogs.com> <87a9fqy8q9.fsf@building.gnus.org> <871u12tyz8.fsf@violet.siamics.net> <87d28j8z67.fsf@violet.siamics.net> <87k32r7fje.fsf@violet.siamics.net> <87tx1hnh5d.fsf_-_@violet.siamics.net> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: ger.gmane.org 1417344446 12197 80.91.229.3 (30 Nov 2014 10:47:26 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 30 Nov 2014 10:47:26 +0000 (UTC) To: 19225@debbugs.gnu.org, control@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Nov 30 11:47:20 2014 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Xv22A-0005uP-MF for geb-bug-gnu-emacs@m.gmane.org; Sun, 30 Nov 2014 11:47:18 +0100 Original-Received: from localhost ([::1]:50099 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xv22A-0008KA-54 for geb-bug-gnu-emacs@m.gmane.org; Sun, 30 Nov 2014 05:47:18 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:40830) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xv221-0008Jk-60 for bug-gnu-emacs@gnu.org; Sun, 30 Nov 2014 05:47:14 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xv21v-0007vg-Ut for bug-gnu-emacs@gnu.org; Sun, 30 Nov 2014 05:47:09 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:52357) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xv21u-0007vJ-OW for bug-gnu-emacs@gnu.org; Sun, 30 Nov 2014 05:47:03 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1Xv21u-0003Xy-AJ for bug-gnu-emacs@gnu.org; Sun, 30 Nov 2014 05:47:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Ivan Shmakov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 30 Nov 2014 10:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 19225 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 19225-submit@debbugs.gnu.org id=B19225.141734437213560 (code B ref 19225); Sun, 30 Nov 2014 10:47:02 +0000 Original-Received: (at 19225) by debbugs.gnu.org; 30 Nov 2014 10:46:12 +0000 Original-Received: from localhost ([127.0.0.1]:49570 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Xv212-0003WX-B7 for submit@debbugs.gnu.org; Sun, 30 Nov 2014 05:46:12 -0500 Original-Received: from fely.am-1.org ([78.47.74.50]:42919) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Xv20r-0003Vg-0a; Sun, 30 Nov 2014 05:46:01 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=siamics.net; s=a2013295; h=Content-Type:MIME-Version:Message-ID:In-Reply-To:Date:Sender:References:Subject:To:From; bh=FufxlWpSYod9klhLLVKiZgVU1/uVWb4QK1eKthysaE8=; b=eR2hNyxV7UFev+5MiTqSUccbm/0nDuiWjTUvtacqcq/guigOX7O1p/eNNvb78xxwoDVrPhZDJbdYDJr/mYuvzGkam1pS8Xp316WQEtDAY9BuO+Brh0Hk+4QCjwRCC2tq6316JMSjDdlwkDyY5DZy2c4UNPIWgSkoVQPIZ1aGX5k=; Original-Received: from [2a02:2560:6d4:26ca::1:1d] (helo=violet.siamics.net) by fely.am-1.org with esmtps (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1Xv20o-0007IQ-V6; Sun, 30 Nov 2014 10:45:55 +0000 Original-Received: from localhost ([::1] helo=violet.siamics.net) by violet.siamics.net with esmtps (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1Xv20h-0004O6-Kq; Sun, 30 Nov 2014 17:45:47 +0700 Mail-Followup-To: 19225@debbugs.gnu.org In-Reply-To: <87tx1hnh5d.fsf_-_@violet.siamics.net> (Ivan Shmakov's message of "Sun, 30 Nov 2014 09:59:10 +0000") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:96752 Archived-At: --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable tags 19225 + patch thanks >>>>> Ivan Shmakov writes: >>>>> Lars Magne Ingebrigtsen writes: >>>>> Ivan Shmakov writes: [=E2=80=A6] >>> The plist-put calls down that progn are evaluated after >>> eww-display-*, and thus after either eww-setup-buffer or some other >>> set-buffer. The eww-use-external-browser-for-content-type case I=E2= =80=99m >>> unsure about, though. >> I've now removed the statement. > Following the change for eww-display-* /not/ to change the > current buffer ($ git log entry MIMEd), those forms are now also > evaluated in the data buffer. =E2=80=A6 As well as a couple of eww-update-header-line-format calls. Please consider the patch MIMEd. This one doesn=E2=80=99t pass the data buffer to eww-after-render-hook, and I hope this still could be resolved a bit later. * eww.el (eww-render): Call eww-update-header-line-format unconditionally and in the browsing buffer (was: data buffer); change eww-data and eww-history-position for the browsing buffer, and run eww-after-render-hook there, too. (eww-display-html): Do not call eww-update-header-line-format or change eww-data, eww-history-position (now done in eww-render.) 283 (defun eww-render (status url &optional point buffer encode) =E2=80=A6 287 (let* ((headers (eww-parse-headers)) =E2=80=A6 298 (data-buffer (current-buffer))) 299 (unwind-protect 300 (progn 301 (cond =E2=80=A6 310 ((string-match-p "\\`image/" (car content-type)) 311 (eww-display-image buffer) 312 (eww-update-header-line-format)) 313 (t 314 (eww-display-raw buffer encode) 315 (eww-update-header-line-format))) 316 (plist-put eww-data :url url) 317 (setq eww-history-position 0) 318 (run-hooks 'eww-after-render-hook)) 319 (kill-buffer data-buffer)))) [=E2=80=A6] --=20 FSF associate member #7257 np. Surrender =E2=80=94 Jami Sieber =E2=80=A6 3= 013 B6A0 230E 334A --=-=-= Content-Type: text/diff Content-Disposition: inline --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -308,14 +315,14 @@ defun eww-render (status url &optional point buffer encode) ((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 () @@ -403,10 +411,7 @@ defun eww-display-html (charset url &optional document point buffer encode) (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)) --=-=-=--