From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Ivan Kanis Newsgroups: gmane.emacs.bugs Subject: bug#16204: proposed patch for 24.4 Date: Fri, 25 Jul 2014 11:58:59 +0200 Message-ID: <87egx9zrmk.fsf@kanis.fr> References: <87ob4bwj6l.fsf@violet.siamics.net> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1406282471 4174 80.91.229.3 (25 Jul 2014 10:01:11 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 25 Jul 2014 10:01:11 +0000 (UTC) Cc: 16204@debbugs.gnu.org To: Lars Ingebrigtsen Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Jul 25 12:01:05 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 1XAcJE-0002sm-Gg for geb-bug-gnu-emacs@m.gmane.org; Fri, 25 Jul 2014 12:01:04 +0200 Original-Received: from localhost ([::1]:53919 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XAcJE-0005bC-5O for geb-bug-gnu-emacs@m.gmane.org; Fri, 25 Jul 2014 06:01:04 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:48308) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XAcIQ-0004Zw-EZ for bug-gnu-emacs@gnu.org; Fri, 25 Jul 2014 06:00:20 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XAcIK-0003PT-Mj for bug-gnu-emacs@gnu.org; Fri, 25 Jul 2014 06:00:14 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:42120) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XAcIK-0003PI-Jt for bug-gnu-emacs@gnu.org; Fri, 25 Jul 2014 06:00:08 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1XAcIJ-0000yI-2U for bug-gnu-emacs@gnu.org; Fri, 25 Jul 2014 06:00:07 -0400 X-Loop: help-debbugs@gnu.org In-Reply-To: <87ob4bwj6l.fsf@violet.siamics.net> Resent-From: Ivan Kanis Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 25 Jul 2014 10:00:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 16204 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: pending Original-Received: via spool by 16204-submit@debbugs.gnu.org id=B16204.14062823543644 (code B ref 16204); Fri, 25 Jul 2014 10:00:06 +0000 Original-Received: (at 16204) by debbugs.gnu.org; 25 Jul 2014 09:59:14 +0000 Original-Received: from localhost ([127.0.0.1]:37386 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XAcHR-0000wg-7D for submit@debbugs.gnu.org; Fri, 25 Jul 2014 05:59:13 -0400 Original-Received: from kanis.fr ([46.19.35.252]:44716 helo=srv2.kanis.fr) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XAcHO-0000wR-Vu for 16204@debbugs.gnu.org; Fri, 25 Jul 2014 05:59:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=kanis.fr; s=alpha; h=Content-Type:MIME-Version:Message-ID:Date:cc:Subject:To:From; bh=OZEZco7wQqK8HbGLx4lOrFbq9yuoEbp3s+eaTR+HymI=; b=pt0mguh6FFWCDMaKhAZDwxJuJRN2k088l8Xhm8EFxrxzVCFD3co4wmhYnhexHh+XWieUj3+aNim5BRoFaPShQMB+OzSxaHFU6lvu5gdDVpsDXR1JNU2L0UtDWm09RDQv; Original-Received: from smtp.comencini.fr ([164.138.25.8]) by smtp.comencini.fr with esmtpsa (TLS1.1:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.80.1) (envelope-from ) id 1XAcHC-0005S3-Qo; Fri, 25 Jul 2014 11:58:59 +0200 Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAAXNSR0IArs4c6QAAAB5QTFRF IBkXUxMTOCwoTC4qcUY8iFxQmmper31txpaJ/v/8aKZ1oAAAAcVJREFUOMt100tu2zAQAFDCXnUZ oAcIqG68LZULVLQBbwuSiffm6AIRRyeotAySJoVu2+FPpJWWC3/4NKOZocSW/yxWfnJ2+Bdwzhj7 8gleWVy7DXC2rkMNr2V/zRbghXIwthf3VbIA9Ffc71vZCSFyCEsBggtNS8ludwvfmhYA0Vn9o4DP zMWxR7+cPWzAYFzwM0ModtdmcDbDS6i/hT7L+RZof5yCXGrYe5jn2YO6BYMjgY+51tCIAqHgBLwR pwLnGuRjAKyBJkuN4yd4U92uCY1vUr2D/c5b8DuxyQwfOHUeaLqDJhnkkuGXbB56h2C1IVBdgncc bBi6feroa9B6jUDojnQPQKupbyXyeeCE1oT7Oqrt+SnfY3mkiyGA/3AmD3H5g32CcBx6hY8pRkwJ 9PpcjRGobUfprFnhAa1vepwcgMOhwG+pdSgKHFU9HAvoAH6XUl7lDUCCq5Qb6GMbVm3Aj++qDYCt wdBc/YHgOFCmS3mjDMRcSE2qY4E3Q3PVIQRQmeodNH4QEbRUFZzW+VotzwX4yTcRTySOML1qjcE5 hTirVqDHkMAP0PjAywp3d18JZtqzvr9zDYD+GaSKtE6Zlr/DLPNFmOcvBAAAAABJRU5ErkJggg== User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.91 (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:91782 Archived-At: Hi Lars, This bug has been driving me nuts for a while. I have set shr-width many times and it would just not work. I have then wasted time trying to find out why it didn't work. I would like to spare that time to users of 24.4 when it gets released. I propose the following patch in the branch emacs-24 on bzr: === modified file 'lisp/net/eww.el' --- lisp/net/eww.el 2014-03-05 18:44:58 +0000 +++ lisp/net/eww.el 2014-07-25 09:32:01 +0000 @@ -264,7 +264,6 @@ (setq eww-current-dom document) (let ((inhibit-read-only t) (after-change-functions nil) - (shr-width nil) (shr-target-id (url-target (url-generic-parse-url url))) (shr-external-rendering-functions '((title . eww-tag-title) === modified file 'lisp/net/shr.el' --- lisp/net/shr.el 2014-04-14 22:01:54 +0000 +++ lisp/net/shr.el 2014-07-25 09:25:15 +0000 @@ -196,8 +196,7 @@ (let ((start (point)) (shr-state nil) (shr-start nil) - (shr-base nil) - (shr-width (or shr-width (1- (window-width))))) + (shr-base nil)) (shr-descend (shr-transform-dom dom)) (shr-remove-trailing-whitespace start (point)))) I have tested with shr-width equal to nil and 70 and it does the right thing ie. the former wraps at the window width and the latter at column 70. I can commit it if everyone is OK with this. Ivan -- The monitor needs another box of pixels. -- BOFH excuse #60