From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Jim Porter Newsgroups: gmane.emacs.bugs Subject: bug#72721: 31.0.50; Visual-wrap-prefix-mode breaks Magit log buffers Date: Mon, 19 Aug 2024 17:46:18 -0700 Message-ID: <49828281-6a20-3791-91bd-9708ec51eb57@gmail.com> References: <87cym4ry3e.fsf@gautierponsinet.xyz> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------uk4b8nICc0faNLSdvxp0SVTi" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="3623"; mail-complaints-to="usenet@ciao.gmane.io" Cc: eliz@gnu.org To: Gautier Ponsinet , 72721@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Aug 20 02:48:46 2024 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1sgD3G-0000kp-1e for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 20 Aug 2024 02:48:46 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sgD2t-0007b4-Jh; Mon, 19 Aug 2024 20:48:23 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sgD2s-0007ar-9c for bug-gnu-emacs@gnu.org; Mon, 19 Aug 2024 20:48:22 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sgD2r-0007BF-VU for bug-gnu-emacs@gnu.org; Mon, 19 Aug 2024 20:48:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=In-Reply-To:From:References:MIME-Version:Date:To:Subject; bh=7jP234xiBU++0ZaJg2vuQtdBglXO8YnUVj2sC8hly4s=; b=OGAETX4glc0iM/yUrRiew+Tkvmq/HpVzTiJd+Z+4z1gb5iEuVEeVu+sQT5hMbg5E9j1lu/+0FAeIZyyAJnontMX2keRTwl6SXa+SfojKDvOlR2y8a0nu1tAT6cD7h7n19nHD6cdrnaEwdNyEuEnF/Bt8l30rfpCAsWT5SiI01UUd6Ntmu2pGGKqfcCYCK0AFBMbRBo2pRoTMvJl+ZneGb+GytCzIqotQ8naEN7KcN56oAteRREQLMLkMuxKYiJQDyQCoTXBU6s6jjevaHSZQDM+J0Bex/QKpVOX0dSwhvg3w5fuWHnZoKUo0aIRK2YkxAPSzhaz16TC63S2M8/fGTw==; Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sgD3W-0006LH-7m for bug-gnu-emacs@gnu.org; Mon, 19 Aug 2024 20:49:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Jim Porter Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 20 Aug 2024 00:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72721 X-GNU-PR-Package: emacs Original-Received: via spool by 72721-submit@debbugs.gnu.org id=B72721.172411489024316 (code B ref 72721); Tue, 20 Aug 2024 00:49:02 +0000 Original-Received: (at 72721) by debbugs.gnu.org; 20 Aug 2024 00:48:10 +0000 Original-Received: from localhost ([127.0.0.1]:59453 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sgD2f-0006K7-NW for submit@debbugs.gnu.org; Mon, 19 Aug 2024 20:48:10 -0400 Original-Received: from mail-pf1-f180.google.com ([209.85.210.180]:54703) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sgD2d-0006Jt-Vj for 72721@debbugs.gnu.org; Mon, 19 Aug 2024 20:48:08 -0400 Original-Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-71275436546so4226428b3a.1 for <72721@debbugs.gnu.org>; Mon, 19 Aug 2024 17:47:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1724114779; x=1724719579; darn=debbugs.gnu.org; h=in-reply-to:from:cc:references:to:content-language:subject :mime-version:date:message-id:from:to:cc:subject:date:message-id :reply-to; bh=7jP234xiBU++0ZaJg2vuQtdBglXO8YnUVj2sC8hly4s=; b=Lyx5sum+/gddvfs7S0Xb77I9D5o+47cSxnWKD3u/GxJDtaU96GDWLe7AKs+pYSP/IL /HTCwZ0yM4LJs5gROrPTI64SZvIscB/IfLqVxi3bSX9XIrKTxi2OPSFPzcWjHPoWgtaF me6A0M8kDM3Qc91MwkIkXKqfuVhps14G1UywTHWGrI9EatKLd0EP/FgqjCmPErBS1hzM lJ2IEusROPDfQoiWXlvk2jUJM0rzgOiwdZST4Lr9UrKXznXUIV6SAFASdmWcZO2SIemN srexvXRBW9n2aWShjkPOU3dsJ9KrBU9NcME9892/pp+yX91Tn+vR7HwZhi5W1VB5ldZc mWZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724114779; x=1724719579; h=in-reply-to:from:cc:references:to:content-language:subject :mime-version:date:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=7jP234xiBU++0ZaJg2vuQtdBglXO8YnUVj2sC8hly4s=; b=hr2V7T86KWaHf/LD5MgjrJzXlzcsYBXDcWGMWayOJkNAheF3e7mMIq6qCVaSNRRjYL NuNh20P4frHq025A14WGev2CY2AJCdKDiMDCOTqm5gOM90k90mz/ztz0app1EHuB4GQA 16p/zKQVHOdPjwJ44mfcS68AxlPv8A3BCTT03TgRWrquyG7zbsraCgQiGKA/N2YB5uNT aYEbgftEap01i8TEG3yn424VK326KrBuc/I51jhZTUhHGC77cV/u7GXaAJU1ku02SEsm EXm99MoYQA11Uio+Q8Wj+SmFvmZKfDXgaMr8B6+UiIUk6KH9jI18aoHUyM2Cqemya6tY 8M7Q== X-Forwarded-Encrypted: i=1; AJvYcCW3XxBNZ89uuMZhbqD36VWEMkcx72NBUCzuwx1eg162U4JxyxqslUhSzOVoIr/FM8Zp2n74fQ==@debbugs.gnu.org X-Gm-Message-State: AOJu0YxtMYxgf+ti1t3edZjaStUciFqJ2bc1HDsUl3d8TnUQAsluLtPt 13H3aUrP3INzkbddjiN1JqdB7oRYdaA71bQMOacsWPFSCgUX6Uod X-Google-Smtp-Source: AGHT+IFKt1VtKaVcCvIqPgAvPyuU+u8+iOBnwDlgh3NkaL/SY32WBa59tHXi81p8UOEhs5pavmjB3Q== X-Received: by 2002:a05:6a20:ce4a:b0:1c3:ac70:f579 with SMTP id adf61e73a8af0-1c9050279a2mr17454723637.38.1724114779375; Mon, 19 Aug 2024 17:46:19 -0700 (PDT) Original-Received: from [192.168.1.2] (syn-023-240-098-037.res.spectrum.com. [23.240.98.37]) by smtp.googlemail.com with ESMTPSA id d2e1a72fcca58-7127aef57fbsm7370734b3a.97.2024.08.19.17.46.18 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 19 Aug 2024 17:46:18 -0700 (PDT) Content-Language: en-US In-Reply-To: <87cym4ry3e.fsf@gautierponsinet.xyz> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:290417 Archived-At: This is a multi-part message in MIME format. --------------uk4b8nICc0faNLSdvxp0SVTi Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 8/19/2024 2:39 PM, Gautier Ponsinet wrote: > Hello everyone, > > The new visual-wrap-prefix-mode breaks the rendering of the Magit Log > buffers. > > In emacs -Q: > * Install Magit and its dependencies and load Magit. > * Go to a local repository (via M-x dired or M-x cd). > * M-x global-visual-wrap-prefix-mode > * M-x magit-log-current > > Could someone please confirm/reproduce? I can confirm this. I'm not quite sure of all the details, but it seem that this is due to a bad interaction between overlays and the 'min-width' display spec. The end result was that we were calling 'get-text-property' with a (large-ish) buffer position when the OBJECT arg was a string of length 1. That can happen in magit-log on the mostly-blank line where it's making the ASCII art just below a merge commit. (The leading whitespace makes 'visual-wrap-prefix-mode' do its thing.) I'm not super familiar with how the display engine works, but I think we don't want to call 'display_min_width' when we're working with an overlay. See the attached patch. Eli, I'm sure you understand this code much better than me. Does the above make sense? I can also try to improve the commentary in the code, but I'm just making some educated guesses as to what's happening here. --------------uk4b8nICc0faNLSdvxp0SVTi Content-Type: text/plain; charset=UTF-8; name="0001-Fix-bad-interaction-between-min-width-display-spec-a.patch" Content-Disposition: attachment; filename*0="0001-Fix-bad-interaction-between-min-width-display-spec-a.pa"; filename*1="tch" Content-Transfer-Encoding: base64 RnJvbSBkYTAyMTU3ZWU2OWM2YWUyYTIyMGE4ZjM4YTljZDhjMGY3MTA1NjQxIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j b20+CkRhdGU6IE1vbiwgMTkgQXVnIDIwMjQgMTc6Mzg6NDcgLTA3MDAKU3ViamVjdDogW1BB VENIXSBGaXggYmFkIGludGVyYWN0aW9uIGJldHdlZW4gJ21pbi13aWR0aCcgZGlzcGxheSBz cGVjIGFuZAogb3ZlcmxheXMKCiogc3JjL3hkaXNwLmMgKGhhbmRsZV9kaXNwbGF5X3Byb3Ap OiBEb24ndCBoYW5kbGUgJ21pbi13aWR0aCcgd2hlbgppdGVyYXRpbmcgb3ZlciBhIHN0cmlu ZyAoYnVnIzcyNzIxKS4KLS0tCiBzcmMveGRpc3AuYyB8IDE2ICsrKysrKysrKystLS0tLS0K IDEgZmlsZSBjaGFuZ2VkLCAxMCBpbnNlcnRpb25zKCspLCA2IGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL3NyYy94ZGlzcC5jIGIvc3JjL3hkaXNwLmMKaW5kZXggMzA3NzFhMWM4M2Qu LmJkNjY1N2ZlNTIyIDEwMDY0NAotLS0gYS9zcmMveGRpc3AuYworKysgYi9zcmMveGRpc3Au YwpAQCAtNTc5MSwxNCArNTc5MSwxOCBAQCBoYW5kbGVfZGlzcGxheV9wcm9wIChzdHJ1Y3Qg aXQgKml0KQogICBwcm9wdmFsID0gZ2V0X2NoYXJfcHJvcGVydHlfYW5kX292ZXJsYXkgKG1h a2VfZml4bnVtIChwb3NpdGlvbi0+Y2hhcnBvcyksCiAJCQkJCSAgIFFkaXNwbGF5LCBvYmpl Y3QsICZvdmVybGF5KTsKIAotICAvKiBSZXN0IG9mIHRoZSBjb2RlIG11c3QgaGF2ZSBPQkpF Q1QgYmUgZWl0aGVyIGEgc3RyaW5nIG9yIGEgYnVmZmVyLiAgKi8KKwogICBpZiAoIVNUUklO R1AgKGl0LT5zdHJpbmcpKQotICAgIG9iamVjdCA9IGl0LT53LT5jb250ZW50czsKKyAgICB7 CisgICAgICAvKiBSZXN0IG9mIHRoZSBjb2RlIG11c3QgaGF2ZSBPQkpFQ1QgYmUgZWl0aGVy IGEgc3RyaW5nIG9yIGEgYnVmZmVyLiAgKi8KKyAgICAgIG9iamVjdCA9IGl0LT53LT5jb250 ZW50czsKIAotICAvKiBIYW5kbGUgbWluLXdpZHRoIGVuZHMuICovCi0gIGlmICghTklMUCAo aXQtPm1pbl93aWR0aF9wcm9wZXJ0eSkKLSAgICAgICYmIE5JTFAgKGZpbmRfZGlzcGxheV9w cm9wZXJ0eSAocHJvcHZhbCwgUW1pbl93aWR0aCkpKQotICAgIGRpc3BsYXlfbWluX3dpZHRo IChpdCwgYnVmcG9zLCBvYmplY3QsIFFuaWwpOworICAgICAgLyogSGFuZGxlIG1pbi13aWR0 aCBlbmRzLiAgVGhpcyBkb2Vzbid0IGFwcGx5IHdoaWxlIGl0ZXJhdGluZyBvdmVyCisJIGEg c3RyaW5nLiAgKi8KKyAgICAgIGlmICghTklMUCAoaXQtPm1pbl93aWR0aF9wcm9wZXJ0eSkK KwkgICYmIE5JTFAgKGZpbmRfZGlzcGxheV9wcm9wZXJ0eSAocHJvcHZhbCwgUW1pbl93aWR0 aCkpKQorCWRpc3BsYXlfbWluX3dpZHRoIChpdCwgYnVmcG9zLCBvYmplY3QsIFFuaWwpOwor ICAgIH0KIAogICBpZiAoTklMUCAocHJvcHZhbCkpCiAgICAgcmV0dXJuIEhBTkRMRURfTk9S TUFMTFk7Ci0tIAoyLjI1LjEKCg== --------------uk4b8nICc0faNLSdvxp0SVTi--