From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Lars Ingebrigtsen Newsgroups: gmane.emacs.bugs Subject: bug#23431: 25.0.93; EWW hangs Date: Tue, 03 May 2016 20:17:06 +0200 Organization: Programmerer Ingebrigtsen Message-ID: <87h9ef2ehp.fsf@gnus.org> References: <87bn4nx1iq.wl-jch@pps.univ-paris-diderot.fr> <87zis75ibn.fsf@gnus.org> <87d1p35e2g.fsf@gnus.org> <8360uvkt9y.fsf@gnu.org> <874maf5cqb.fsf@gnus.org> <8337pzksce.fsf@gnu.org> <87shxz3wfe.fsf@gnus.org> <83wpnbjc8c.fsf@gnu.org> <878tzr3vje.fsf@gnus.org> <83twifjb9k.fsf@gnu.org> <87vb2v2g95.fsf@gnus.org> <83r3djjaxr.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1462299584 7333 80.91.229.3 (3 May 2016 18:19:44 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 3 May 2016 18:19:44 +0000 (UTC) To: 23431@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue May 03 20:19:32 2016 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 1axeuw-0002uj-Gc for geb-bug-gnu-emacs@m.gmane.org; Tue, 03 May 2016 20:19:30 +0200 Original-Received: from localhost ([::1]:42701 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1axeus-000136-Ly for geb-bug-gnu-emacs@m.gmane.org; Tue, 03 May 2016 14:19:26 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:47841) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1axeuj-0000pH-E7 for bug-gnu-emacs@gnu.org; Tue, 03 May 2016 14:19:23 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1axeuX-0002yQ-DC for bug-gnu-emacs@gnu.org; Tue, 03 May 2016 14:19:12 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:51554) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1axeuX-0002vU-9W for bug-gnu-emacs@gnu.org; Tue, 03 May 2016 14:19:05 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1axeuT-0002pK-UZ for bug-gnu-emacs@gnu.org; Tue, 03 May 2016 14:19:01 -0400 X-Loop: help-debbugs@gnu.org In-Reply-To: <87bn4nx1iq.wl-jch@pps.univ-paris-diderot.fr> Resent-From: Lars Ingebrigtsen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 03 May 2016 18:19:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 23431 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.146229949310808 (code B ref -1); Tue, 03 May 2016 18:19:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 3 May 2016 18:18:13 +0000 Original-Received: from localhost ([127.0.0.1]:35658 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1axeth-0002oG-45 for submit@debbugs.gnu.org; Tue, 03 May 2016 14:18:13 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:55921) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1axetf-0002o4-PC for submit@debbugs.gnu.org; Tue, 03 May 2016 14:18:12 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1axetR-00020L-58 for submit@debbugs.gnu.org; Tue, 03 May 2016 14:18:03 -0400 Original-Received: from lists.gnu.org ([2001:4830:134:3::11]:53699) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1axetR-0001xa-2a for submit@debbugs.gnu.org; Tue, 03 May 2016 14:17:57 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:46600) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1axetF-0007Lv-7A for bug-gnu-emacs@gnu.org; Tue, 03 May 2016 14:17:51 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1axet0-0001gw-P6 for bug-gnu-emacs@gnu.org; Tue, 03 May 2016 14:17:37 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:53124) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1axet0-0001ZD-Ao for bug-gnu-emacs@gnu.org; Tue, 03 May 2016 14:17:30 -0400 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1axesj-0001gJ-C7 for bug-gnu-emacs@gnu.org; Tue, 03 May 2016 20:17:13 +0200 Original-Received: from cm-84.215.1.64.getinternet.no ([84.215.1.64]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 03 May 2016 20:17:13 +0200 Original-Received: from larsi by cm-84.215.1.64.getinternet.no with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 03 May 2016 20:17:13 +0200 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: bug-gnu-emacs@gnu.org Original-Lines: 44 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: cm-84.215.1.64.getinternet.no Mail-Copies-To: never User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1.50 (gnu/linux) Cancel-Lock: sha1:7JRhbKtY5fBr2FqVTTNaTRgke8w= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.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" Xref: news.gmane.org gmane.emacs.bugs:117673 Archived-At: Does the following patch help? It'll cache the metadata. Doesn't make much difference on the test image for me. diff --git a/lisp/image.el b/lisp/image.el index 2ae642a..9c27664 100644 --- a/lisp/image.el +++ b/lisp/image.el @@ -698,14 +698,21 @@ image-multi-frame-p the number of frames (or sub-images) in the image and DELAY is the delay in seconds that the image specifies between each frame. DELAY may be nil, in which case you might want to use `image-default-frame-delay'." - (when (fboundp 'image-metadata) - (let* ((metadata (image-metadata image)) - (images (plist-get metadata 'count)) - (delay (plist-get metadata 'delay))) - (when (and images (> images 1)) - (and delay (or (not (numberp delay)) (< delay 0)) - (setq delay image-default-frame-delay)) - (cons images delay))))) + (or (plist-get (cdr image) :image-metadata) + (when (fboundp 'image-metadata) + (let* ((metadata (image-metadata image)) + (images (plist-get metadata 'count)) + (delay (plist-get metadata 'delay)) + (result + (and images + (> images 1) + (cons images + (if (or (not (numberp delay)) + (< delay 0)) + image-default-frame-delay + delay))))) + (plist-put (cdr image) :image-metadata result) + result)))) (defun image-animated-p (image) "Like `image-multi-frame-p', but returns nil if no delay is specified." -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no