From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Mauro Aranda Newsgroups: gmane.emacs.bugs Subject: bug#64649: 30.0.50; Customize: Comments on face customization not being saved Date: Sat, 15 Jul 2023 18:59:29 -0300 Message-ID: References: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------IZ6i88LFbnZ86Cn4H0C8KkJ1" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="3454"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 To: 64649@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Jul 16 00:00:19 2023 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 1qKnJL-0000ln-6g for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 16 Jul 2023 00:00:19 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qKnJ5-000076-Qi; Sat, 15 Jul 2023 18:00:03 -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 1qKnJ4-00006x-GY for bug-gnu-emacs@gnu.org; Sat, 15 Jul 2023 18:00:02 -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 1qKnJ4-00040K-89 for bug-gnu-emacs@gnu.org; Sat, 15 Jul 2023 18:00:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qKnJ4-00084j-42 for bug-gnu-emacs@gnu.org; Sat, 15 Jul 2023 18:00:02 -0400 X-Loop: help-debbugs@gnu.org In-Reply-To: Resent-From: Mauro Aranda Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 15 Jul 2023 22:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64649 X-GNU-PR-Package: emacs Original-Received: via spool by 64649-submit@debbugs.gnu.org id=B64649.168945838330981 (code B ref 64649); Sat, 15 Jul 2023 22:00:02 +0000 Original-Received: (at 64649) by debbugs.gnu.org; 15 Jul 2023 21:59:43 +0000 Original-Received: from localhost ([127.0.0.1]:46218 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qKnIk-00083d-HB for submit@debbugs.gnu.org; Sat, 15 Jul 2023 17:59:42 -0400 Original-Received: from mail-oi1-x232.google.com ([2607:f8b0:4864:20::232]:60863) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qKnIi-00083O-3I for 64649@debbugs.gnu.org; Sat, 15 Jul 2023 17:59:41 -0400 Original-Received: by mail-oi1-x232.google.com with SMTP id 5614622812f47-38c35975545so2581608b6e.1 for <64649@debbugs.gnu.org>; Sat, 15 Jul 2023 14:59:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1689458374; x=1692050374; h=subject:from:to:content-language:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=69CXrCq7zSRI/3IB75tx1Cz8Vq7xPAW3b+rneS+X2/A=; b=CKvmRZwcyz1GMp1sW/qhMnaed0vw81PmqM0FiHC06ualndiFTRCG1eHDtCxU6FtK+7 OwNYry2OalEqg7duQJzK4uQku9Yqop81PGnTTqQqIKB9fqXqYkbOQArp5a8jDPubB1Dj yIHaU/mTpNME+6OMGbqXGfgzcT8/odXb/SnT6hgjxAw3SV27oYb3nK+ge25adjUccqrQ PuqmzKJxISeZ+U0Qx+4He1cH7f/jRxGvYT6rG0V9Ibn/OwT+0NqpBwSTBtatFf2bfvwN tYpeIlYzmG/psIbob8p8CSfb2B2G4MDOf2Ftth/gjCvpA/9kVuDBHuLTcr4tjjH9VzY2 t6pQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689458374; x=1692050374; h=subject:from:to:content-language:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=69CXrCq7zSRI/3IB75tx1Cz8Vq7xPAW3b+rneS+X2/A=; b=hhWeHXJNlTwgNgZvxlf6RQ5wvxFHj9F3K7P1eb+hTPaBIAKzV+JA2/wX3RAtqqZYqM evkjLk8BDeJO2mVXVBTyWT0Pn2t1Pm4/w1OImqAa5QcaAouOXO4wZWOEtu2Sd2WYBegQ lrkEAxIGoAO2HaE6PpNzDRW9bv+gofj5Wfd0fbIydF8K2lOnjFTqeLvMVxWAfB2Xtn5e IqhQWPT6YBBww0wVQGkDwTRT02fJk7CQyTociCLzPjiB5jVPeDNWikaHcQMW/lx1HbZZ xtmzOj2aFUCYDSXuh8s5/QrUXlaPtumYh+nDM/GNllQ8ZkQeis7XVRTY1a3zB/uNlkX/ DpmQ== X-Gm-Message-State: ABy/qLZ/j19tzhAzzegLN3WUcGvvv5DdeR2OYPKfX97nj58i0zm7Lkf/ FNUGKCQECa7I+Qm7z8vfZ8j2t0fERe5Bow== X-Google-Smtp-Source: APBJJlHKT3+XK/HUH6PAtYcoBq0ZgVh1t/tem09Xey+wwkqqXe4A0Kop/Lvtx46lLi0tm/vlSebaXg== X-Received: by 2002:aca:bd04:0:b0:398:2f92:65ca with SMTP id n4-20020acabd04000000b003982f9265camr6752042oif.7.1689458373287; Sat, 15 Jul 2023 14:59:33 -0700 (PDT) Original-Received: from [192.168.0.234] ([186.127.128.249]) by smtp.gmail.com with ESMTPSA id o21-20020a4a2c15000000b0054fcc25de1fsm5479804ooo.2.2023.07.15.14.59.31 for <64649@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 15 Jul 2023 14:59:32 -0700 (PDT) Content-Language: en-US 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:265251 Archived-At: This is a multi-part message in MIME format. --------------IZ6i88LFbnZ86Cn4H0C8KkJ1 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit I attach a patch to fix this.  The commit that introduced this regression showed that we weren't taking care of preserving the comments when redrawing either the custom-face or the custom-variable widget. --------------IZ6i88LFbnZ86Cn4H0C8KkJ1 Content-Type: text/x-patch; charset=UTF-8; name="0001-Preserve-comments-when-redrawing-a-widget-Bug-64649.patch" Content-Disposition: attachment; filename*0="0001-Preserve-comments-when-redrawing-a-widget-Bug-64649.pat"; filename*1="ch" Content-Transfer-Encoding: base64 RnJvbSBkNzc4NTFiYThiNDM0Njk3YTdlNWE3OTdlOTExNWZlMDA4YjRlY2Y1IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBNYXVybyBBcmFuZGEgPG1hdXJvb2FyYW5kYUBnbWFp bC5jb20+CkRhdGU6IFNhdCwgMTUgSnVsIDIwMjMgMTg6NTQ6MTQgLTAzMDAKU3ViamVjdDog W1BBVENIXSBQcmVzZXJ2ZSBjb21tZW50cyB3aGVuIHJlZHJhd2luZyBhIHdpZGdldCAoQnVn IzY0NjQ5KQoKKiBsaXNwL2N1cy1lZGl0LmVsIChjdXN0b20tY29tbWVudC1wcmVzZXJ2ZSk6 IE5ldyBmdW5jdGlvbi4KKGN1c3RvbS1yZWRyYXcpOiBVc2UgaXQuCihjdXN0b20tY29tbWVu dC1jcmVhdGUpOiBNYWtlIHN1cmUgOmNvbW1lbnQtc2hvd24gaXMgc2V0IHRvIHQgaWYgdGhl CmNvbW1lbnQgd2lkZ2V0IGdldHMgY3JlYXRlZC4KKGN1c3RvbS1mYWNlLXZhbHVlLWNyZWF0 ZSwgY3VzdG9tLXZhcmlhYmxlLXZhbHVlLWNyZWF0ZSk6IFJlY3JlYXRlIHRoZQpjdXN0b20t Y29tbWVudCB3aWRnZXQgd2l0aCB0aGUgcHJlc2VydmVkIHZhbHVlLCBpZiBhbnkuCi0tLQog bGlzcC9jdXMtZWRpdC5lbCB8IDQ1ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr LS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDMyIGluc2VydGlvbnMoKyksIDEzIGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2xpc3AvY3VzLWVkaXQuZWwgYi9saXNwL2N1cy1l ZGl0LmVsCmluZGV4IGRiZWY1ZjQ3Y2Q2Li4xYzRkZTkyZGIxMiAxMDA2NDQKLS0tIGEvbGlz cC9jdXMtZWRpdC5lbAorKysgYi9saXNwL2N1cy1lZGl0LmVsCkBAIC0yMzMwLDYgKzIzMzAs NyBAQCBjdXN0b20tcmVkcmF3CiAJKGZyb20gKG1hcmtlci1wb3NpdGlvbiAod2lkZ2V0LWdl dCB3aWRnZXQgOmZyb20pKSkKIAkodG8gKG1hcmtlci1wb3NpdGlvbiAod2lkZ2V0LWdldCB3 aWRnZXQgOnRvKSkpKQogICAgIChzYXZlLWV4Y3Vyc2lvbgorICAgICAgKGN1c3RvbS1jb21t ZW50LXByZXNlcnZlIHdpZGdldCkKICAgICAgICh3aWRnZXQtdmFsdWUtc2V0IHdpZGdldCAo d2lkZ2V0LXZhbHVlIHdpZGdldCkpCiAgICAgICAoY3VzdG9tLXJlZHJhdy1tYWdpYyB3aWRn ZXQpKQogICAgICh3aGVuIChhbmQgKD49IHBvcyBmcm9tKSAoPD0gcG9zIHRvKSkKQEAgLTI1 MDksNyArMjUxMCw5IEBAIGN1c3RvbS1jb21tZW50LWNyZWF0ZQogICAobGV0KiAoKG51bGwt Y29tbWVudCAoZXF1YWwgIiIgKHdpZGdldC12YWx1ZSB3aWRnZXQpKSkpCiAgICAgKGlmIChv ciAod2lkZ2V0LWdldCAod2lkZ2V0LWdldCB3aWRnZXQgOnBhcmVudCkgOmNvbW1lbnQtc2hv d24pCiAJICAgIChub3QgbnVsbC1jb21tZW50KSkKLQkod2lkZ2V0LWRlZmF1bHQtY3JlYXRl IHdpZGdldCkKKyAgICAgICAgKHByb2duCisgICAgICAgICAgKHdpZGdldC1kZWZhdWx0LWNy ZWF0ZSB3aWRnZXQpCisgICAgICAgICAgKHdpZGdldC1wdXQgKHdpZGdldC1nZXQgd2lkZ2V0 IDpwYXJlbnQpIDpjb21tZW50LXNob3duIHQpKQogICAgICAgOzsgYHdpZGdldC1kZWZhdWx0 LWRlbGV0ZScgZXhwZWN0cyBtYXJrZXJzIGluIHRoZXNlIHNsb3RzIC0tCiAgICAgICA7OyBt YXliZSBpdCBzaG91bGRuJ3QuCiAgICAgICAod2lkZ2V0LXB1dCB3aWRnZXQgOmZyb20gKHBv aW50LW1hcmtlcikpCkBAIC0yNTQyLDYgKzI1NDUsMTQgQEAgY3VzdG9tLWNvbW1lbnQtaW52 aXNpYmxlLXAKICAgICAoYW5kIChlcXVhbCAiIiB2YWwpCiAJIChub3QgKHdpZGdldC1nZXQg d2lkZ2V0IDpjb21tZW50LXNob3duKSkpKSkKIAorOzsgVGhpcyBpcyB1c2VmdWwgd2hlbiB3 ZSB3YW50IHRvIHJlZHJhdyBhIHdpZGdldCwgYnV0IHdlIHdhbnQgdG8gcHJlc2VydmUKKzs7 IGVkaXRzIG1hZGUgYnkgdGhlIHVzZXIgaW4gdGhlIGNvbW1lbnQgd2lkZ2V0LiAgKFNlZSBC dWcjNjQ2NDkpCisoZGVmdW4gY3VzdG9tLWNvbW1lbnQtcHJlc2VydmUgKHdpZGdldCkKKyAg IlByZXNlcnZlIHRoZSBjb21tZW50IHRoYXQgYmVsb25ncyB0byBXSURHRVQuIgorICAod2hl biAod2lkZ2V0LWdldCB3aWRnZXQgOmNvbW1lbnQtc2hvd24pCisgICAgKGxldCAoKGNvbW1l bnQtd2lkZ2V0ICh3aWRnZXQtZ2V0IHdpZGdldCA6Y29tbWVudC13aWRnZXQpKSkKKyAgICAg ICh3aWRnZXQtcHV0IGNvbW1lbnQtd2lkZ2V0IDp2YWx1ZSAod2lkZ2V0LXZhbHVlIGNvbW1l bnQtd2lkZ2V0KSkpKSkKKwogOzs7IFRoZSBgY3VzdG9tLXZhcmlhYmxlJyBXaWRnZXQuCiAK IChkZWZmYWNlIGN1c3RvbS12YXJpYWJsZS1vYnNvbGV0ZQpAQCAtMjgyMSwxMiArMjgzMiwx NiBAQCBjdXN0b20tdmFyaWFibGUtdmFsdWUtY3JlYXRlCiAKICAgICAgIDs7IFRoZSBjb21t ZW50IGZpZWxkCiAgICAgICAodW5sZXNzIChlcSBzdGF0ZSAnaGlkZGVuKQotCShsZXQqICgo Y29tbWVudCAoZ2V0IHN5bWJvbCAndmFyaWFibGUtY29tbWVudCkpCi0JICAgICAgIChjb21t ZW50LXdpZGdldAotCQkod2lkZ2V0LWNyZWF0ZS1jaGlsZC1hbmQtY29udmVydAotCQkgd2lk Z2V0ICdjdXN0b20tY29tbWVudAotCQkgOnBhcmVudCB3aWRnZXQKLQkJIDp2YWx1ZSAob3Ig Y29tbWVudCAiIikpKSkKKyAgICAgICAgKGxldCAoKGNvbW1lbnQtd2lkZ2V0CisgICAgICAg ICAgICAgICAod2lkZ2V0LWNyZWF0ZS1jaGlsZC1hbmQtY29udmVydAorICAgICAgICAgICAg ICAgIHdpZGdldCAnY3VzdG9tLWNvbW1lbnQKKyAgICAgICAgICAgICAgICA6cGFyZW50IHdp ZGdldAorICAgICAgICAgICAgICAgIDp2YWx1ZSAob3IKKyAgICAgICAgICAgICAgICAgICAg ICAgIChhbmQKKyAgICAgICAgICAgICAgICAgICAgICAgICAod2lkZ2V0LWdldCB3aWRnZXQg OmNvbW1lbnQtc2hvd24pCisgICAgICAgICAgICAgICAgICAgICAgICAgKHdpZGdldC12YWx1 ZSAod2lkZ2V0LWdldCB3aWRnZXQgOmNvbW1lbnQtd2lkZ2V0KSkpCisgICAgICAgICAgICAg ICAgICAgICAgICAoZ2V0IHN5bWJvbCAndmFyaWFibGUtY29tbWVudCkKKyAgICAgICAgICAg ICAgICAgICAgICAgICIiKSkpKQogCSAgKHdpZGdldC1wdXQgd2lkZ2V0IDpjb21tZW50LXdp ZGdldCBjb21tZW50LXdpZGdldCkKIAkgIDs7IERvbid0IHB1c2ggaXQgISEhIEN1c3RvbSBh c3N1bWVzIHRoYXQgdGhlIGZpcnN0IGNoaWxkIGlzIHRoZQogCSAgOzsgdmFsdWUgb25lLgpA QCAtMzgzMSwxMiArMzg0NiwxNiBAQCBjdXN0b20tZmFjZS12YWx1ZS1jcmVhdGUKIAkgd2lk Z2V0IDp2aXNpYmlsaXR5LXdpZGdldCAnY3VzdG9tLXZpc2liaWxpdHkpCiAJOzsgVGhlIGNv bW1lbnQgZmllbGQKIAkodW5sZXNzIGhpZGRlbnAKLQkgIChsZXQqICgoY29tbWVudCAoZ2V0 IHN5bWJvbCAnZmFjZS1jb21tZW50KSkKLQkJIChjb21tZW50LXdpZGdldAotCQkgICh3aWRn ZXQtY3JlYXRlLWNoaWxkLWFuZC1jb252ZXJ0Ci0JCSAgIHdpZGdldCAnY3VzdG9tLWNvbW1l bnQKLQkJICAgOnBhcmVudCB3aWRnZXQKLQkJICAgOnZhbHVlIChvciBjb21tZW50ICIiKSkp KQorCSAgKGxldCAoKGNvbW1lbnQtd2lkZ2V0CisgICAgICAgICAgICAgICAgICh3aWRnZXQt Y3JlYXRlLWNoaWxkLWFuZC1jb252ZXJ0CisgICAgICAgICAgICAgICAgICB3aWRnZXQgJ2N1 c3RvbS1jb21tZW50CisgICAgICAgICAgICAgICAgICA6cGFyZW50IHdpZGdldAorICAgICAg ICAgICAgICAgICAgOnZhbHVlIChvcgorICAgICAgICAgICAgICAgICAgICAgICAgICAoYW5k CisgICAgICAgICAgICAgICAgICAgICAgICAgICAod2lkZ2V0LWdldCB3aWRnZXQgOmNvbW1l bnQtc2hvd24pCisgICAgICAgICAgICAgICAgICAgICAgICAgICAod2lkZ2V0LXZhbHVlICh3 aWRnZXQtZ2V0IHdpZGdldCA6Y29tbWVudC13aWRnZXQpKSkKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgKGdldCBzeW1ib2wgJ2ZhY2UtY29tbWVudCkKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgIiIpKSkpCiAJICAgICh3aWRnZXQtcHV0IHdpZGdldCA6Y29tbWVudC13aWRn ZXQgY29tbWVudC13aWRnZXQpCiAJICAgIChwdXNoIGNvbW1lbnQtd2lkZ2V0IGNoaWxkcmVu KSkpKQogCi0tIAoyLjM0LjEKCg== --------------IZ6i88LFbnZ86Cn4H0C8KkJ1--