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#71741: 30.0.60; Wrong type argument: number-or-marker-p after C-x C-+ in eww Date: Sun, 23 Jun 2024 17:32:36 -0700 Message-ID: <1c42d70b-e494-9495-4759-56a2acade7fe@gmail.com> References: <8734p38d8h.fsf@pretzelnet.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------EkNC3ywtaPqTsXZOQMQw9xnA" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="23188"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Po Lu To: Stefan Kangas , epg@pretzelnet.org, 71741@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Jun 24 02:34:33 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 1sLXfF-0005oK-0L for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 24 Jun 2024 02:34:33 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sLXem-0001ED-TG; Sun, 23 Jun 2024 20:34:04 -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 1sLXek-0001Dw-EM for bug-gnu-emacs@gnu.org; Sun, 23 Jun 2024 20:34: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 1sLXek-00040r-5q for bug-gnu-emacs@gnu.org; Sun, 23 Jun 2024 20:34:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sLXek-00030O-Ee for bug-gnu-emacs@gnu.org; Sun, 23 Jun 2024 20:34: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: Mon, 24 Jun 2024 00:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71741 X-GNU-PR-Package: emacs Original-Received: via spool by 71741-submit@debbugs.gnu.org id=B71741.171918922711513 (code B ref 71741); Mon, 24 Jun 2024 00:34:02 +0000 Original-Received: (at 71741) by debbugs.gnu.org; 24 Jun 2024 00:33:47 +0000 Original-Received: from localhost ([127.0.0.1]:58535 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sLXeV-0002zb-4h for submit@debbugs.gnu.org; Sun, 23 Jun 2024 20:33:47 -0400 Original-Received: from mail-pl1-f169.google.com ([209.85.214.169]:53503) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sLXeS-0002zD-Ly for 71741@debbugs.gnu.org; Sun, 23 Jun 2024 20:33:45 -0400 Original-Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-1fa2782a8ccso4319305ad.2 for <71741@debbugs.gnu.org>; Sun, 23 Jun 2024 17:33:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719189158; x=1719793958; darn=debbugs.gnu.org; h=in-reply-to:from:references:cc:to:content-language:subject :mime-version:date:message-id:from:to:cc:subject:date:message-id :reply-to; bh=Hg+cGQMA/s5o13udxjSdgCnS6z3M8c1TxgQfrAPryLM=; b=HccLlQ082p6SWSL0r1lUL1q7JA64T5c5MlhThf3sYvetp8ww5Slk2m4N+x/KZK7pm9 ehQ5RErYEUVFvs58INzQNLVyXREOKGC40llB5C8il2Q4dme/LIjP1nW0Xj0HCljvGVSq a1mNGJ4IkqQQdT/O1nyOdY/uMRCvqraWJc49nQDwEfz833lXaNr6izW3AEHKKU9C7fOm CmhgwkaekxaQS9YAn+AA3/uKc1oH9s+h/1iSFrAJ+x+l8gG+TGgRLAJE4VX+K3euvIDY ig/dq3g8s1VhqzGffiRyjSkXGCjaKBlY0iIVGfCvZvO2hkLvTw/AjNj+wX6KycaVe+95 QohQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719189158; x=1719793958; h=in-reply-to:from:references:cc:to:content-language:subject :mime-version:date:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=Hg+cGQMA/s5o13udxjSdgCnS6z3M8c1TxgQfrAPryLM=; b=SJbhsyzF6V9cgHPyP3AOBgSEGXyNXAPRHx3C8SEtYHG8hGxVMTRxAXlIbSorTR69uj FETDnaUiU50mcEh4B8QaPL1wBJ1CNu+ozFcE9tp7nulNFjJKYNfNsqXGmHIdKwNsDlCM FDsXHFlrTEhOv4U79x9+gvZYqzpObkYQ7enUQn28y/xF6vJsjeomvMWPn3tW14fnh/YD A0JD1b4P1PXdhd60ZA7IxBqdVKTMTqo+408OXFrm4SKoVzVjgFE0qPnxzHq+rdlBw8Xm Yu5GgjhCkmE31ZkuAl+458jr4t5t9zarKR/4xS5TdZud2YaXRkqvNcPi7xtAE3aDOL34 9tyQ== X-Forwarded-Encrypted: i=1; AJvYcCUMuB6iYLZXAoWHhAAIiXMF/Y1LvwDd0d1yhRdHdRTyZsXBoaC4vcWxUa5ZwHdkpxieT96CApfLjkBKVXDsAbu3aYYBNNk= X-Gm-Message-State: AOJu0YwA2/9pPBpCtEtoU/rue7axCOi61t5VCn3Vf0aL1QPURmiDrsHi CAyvfbhwJeZv8H98oa+uUUIW5ROpEKDLwNGjud5oV0Mzzz15UxTj X-Google-Smtp-Source: AGHT+IFwJeWNPs/4WbUhC2iv1D53uV8/BxkwS/WuobJ0WFAVq2K5DiAqHymoafgidbe1cqbcJWX+8w== X-Received: by 2002:a17:902:e74d:b0:1f6:fcd9:5b86 with SMTP id d9443c01a7336-1fa23bdab14mr37445575ad.12.1719189157779; Sun, 23 Jun 2024 17:32:37 -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 d9443c01a7336-1f9eb3d49f4sm50395525ad.197.2024.06.23.17.32.36 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 23 Jun 2024 17:32:37 -0700 (PDT) Content-Language: en-US In-Reply-To: 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:287811 Archived-At: This is a multi-part message in MIME format. --------------EkNC3ywtaPqTsXZOQMQw9xnA Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 6/23/2024 4:24 PM, Stefan Kangas wrote: > epg@pretzelnet.org writes: > >> To reproduce: >> - emacs -Q >> - M-x eww RET gnu.org RET C-x C-+ >> >> Expected: >> Text is scaled up without error. >> >> Actual: >> Text is scaled up, but with an error: >> >> run-hooks: Wrong type argument: number-or-marker-p, default > > I can reproduce this bug. Copying in Po Lu. I was just looking at image scaling in an unrelated bug, so I had already swapped in all the necessary mental context for this. Here's a patch. The second part fixes a closely-related issue: the scaling didn't work for sliced images (you can get a sliced image by zooming it: put point on the image and press "z"). Fixing that required fixing a bug in 'get-display-property': it only returned the CAR of the display property value. To maintain backwards compatibility, I changed it so that it still returns the CAR if there's only one element, but it now returns the whole list if there are multiple elements. I don't love this, and maybe we should always return a list, but I'll leave that decision to others (for what it's worth, 'get-display-property' is new in Emacs 29, so there hopefully aren't too many uses of it out in the wild yet). I think the first patch is definitely worth merging to Emacs 30, but the second I'm neutral on. Maybe we should fix 'get-display-property' now? --------------EkNC3ywtaPqTsXZOQMQw9xnA Content-Type: text/plain; charset=UTF-8; name="0001-Fix-rescaling-of-images-via-text-scale-mode-in-EWW.patch" Content-Disposition: attachment; filename*0="0001-Fix-rescaling-of-images-via-text-scale-mode-in-EWW.patc"; filename*1="h" Content-Transfer-Encoding: base64 RnJvbSBhMmYzZDUxZjcwZWZhMWI2NWM5MzA4ZTM0NDVhZGExNmQ0MjExNTg2IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j b20+CkRhdGU6IFN1biwgMjMgSnVuIDIwMjQgMTY6NTk6MDAgLTA3MDAKU3ViamVjdDogW1BB VENIIDEvMl0gRml4IHJlc2NhbGluZyBvZiBpbWFnZXMgdmlhICd0ZXh0LXNjYWxlLW1vZGUn IGluIEVXVwoKKiBsaXNwL25ldC9ld3cuZWwgKGV3dy0tcmVzY2FsZS1pbWFnZXMpOiBIYW5k bGUgYSA6c2NhbGUgb2YgJ2RlZmF1bHQnCihidWcjNzE3NDEpLgotLS0KIGxpc3AvbmV0L2V3 dy5lbCB8IDE0ICsrKysrKysrKy0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgOSBpbnNlcnRpb25z KCspLCA1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2xpc3AvbmV0L2V3dy5lbCBiL2xp c3AvbmV0L2V3dy5lbAppbmRleCBmZDhmODAwNjViMS4uOTRiZmQzMzNmYTkgMTAwNjQ0Ci0t LSBhL2xpc3AvbmV0L2V3dy5lbAorKysgYi9saXNwL25ldC9ld3cuZWwKQEAgLTEzNzEsMTIg KzEzNzEsMTYgQEAgZXd3LS1yZXNjYWxlLWltYWdlcwogICAgICAgKGdvdG8tY2hhciAocG9p bnQtbWluKSkKICAgICAgICh3aGlsZS1sZXQgKChtYXRjaCAodGV4dC1wcm9wZXJ0eS1zZWFy Y2gtZm9yd2FyZAogICAgICAgICAgICAgICAgICAgICAgICAgICAnZGlzcGxheSBuaWwgKGxh bWJkYSAoXyB2YWx1ZSkgKGltYWdlcCB2YWx1ZSkpKSkpCi0gICAgICAgIChsZXQgKChpbWFn ZSAocHJvcC1tYXRjaC12YWx1ZSBtYXRjaCkpKQotICAgICAgICAgICh1bmxlc3MgKGltYWdl LXByb3BlcnR5IGltYWdlIDpvcmlnaW5hbC1zY2FsZSkKLSAgICAgICAgICAgIChzZXRmIChp bWFnZS1wcm9wZXJ0eSBpbWFnZSA6b3JpZ2luYWwtc2NhbGUpCi0gICAgICAgICAgICAgICAg ICAob3IgKGltYWdlLXByb3BlcnR5IGltYWdlIDpzY2FsZSkgMSkpKQorICAgICAgICAobGV0 KiAoKGltYWdlIChwcm9wLW1hdGNoLXZhbHVlIG1hdGNoKSkKKyAgICAgICAgICAgICAgIChv cmlnaW5hbC1zY2FsZSAob3IgKGltYWdlLXByb3BlcnR5IGltYWdlIDpvcmlnaW5hbC1zY2Fs ZSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKHNldGYgKGltYWdlLXBy b3BlcnR5IGltYWdlIDpvcmlnaW5hbC1zY2FsZSkKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgKG9yIChpbWFnZS1wcm9wZXJ0eSBpbWFnZSA6c2NhbGUpCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnZGVmYXVsdCkp KSkpCisgICAgICAgICAgKHdoZW4gKGVxIG9yaWdpbmFsLXNjYWxlICdkZWZhdWx0KQorICAg ICAgICAgICAgKHNldHEgb3JpZ2luYWwtc2NhbGUgKGltYWdlLWNvbXB1dGUtc2NhbGluZy1m YWN0b3IKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbWFnZS1zY2FsaW5n LWZhY3RvcikpKQogICAgICAgICAgIChzZXRmIChpbWFnZS1wcm9wZXJ0eSBpbWFnZSA6c2Nh bGUpCi0gICAgICAgICAgICAgICAgKCogKGltYWdlLXByb3BlcnR5IGltYWdlIDpvcmlnaW5h bC1zY2FsZSkgc2NhbGluZykpKSkpKSkKKyAgICAgICAgICAgICAgICAoKiBvcmlnaW5hbC1z Y2FsZSBzY2FsaW5nKSkpKSkpKQogCiAoZGVmdW4gZXd3LS11cmwtYXQtcG9pbnQgKCkKICAg ImB0aGluZy1hdC1wb2ludCcgcHJvdmlkZXIgZnVuY3Rpb24uIgotLSAKMi4yNS4xCgo= --------------EkNC3ywtaPqTsXZOQMQw9xnA Content-Type: text/plain; charset=UTF-8; name="0002-Support-rescaling-sliced-images-in-EWW-via-text-scal.patch" Content-Disposition: attachment; filename*0="0002-Support-rescaling-sliced-images-in-EWW-via-text-scal.pa"; filename*1="tch" Content-Transfer-Encoding: base64 RnJvbSA1NWE3YjJlYTEyMjBjZGY3ZDBhYTUxMWU0ZjY1YjBkMDIxMTYyYjQ0IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j b20+CkRhdGU6IFN1biwgMjMgSnVuIDIwMjQgMTc6Mjc6MjQgLTA3MDAKU3ViamVjdDogW1BB VENIIDIvMl0gU3VwcG9ydCByZXNjYWxpbmcgc2xpY2VkIGltYWdlcyBpbiBFV1cgdmlhCiAn dGV4dC1zY2FsZS1tb2RlJwoKKiBzcmMveGRpc3AuYyAoZmluZF9kaXNwbGF5X3Byb3BlcnR5 KTogV2hlbiB0aGUgcHJvcGVydHkgdmFsdWUgaGFzCm11bHRpcGxlIGVsZW1lbnRzLCByZXR1 cm4gdGhlIHdob2xlIGxpc3QuCgoqIGxpc3AvbmV0L2V3dy5lbCAoZXd3LS1yZXNjYWxlLWlt YWdlcyk6IFVzZSAnZ2V0LWRpc3BsYXktcHJvcGVydHknLgoKKiBkb2MvbGlzcHJlZi9kaXNw bGF5LnRleGkgKERpc3BsYXkgUHJvcGVydHkpOiBEZXNjcmliZSB0aGUgbmV3CidnZXQtZGlz cGxheS1wcm9wZXJ0eScgYmVoYXZpb3IuCi0tLQogZG9jL2xpc3ByZWYvZGlzcGxheS50ZXhp IHwgIDYgKysrKy0tCiBsaXNwL25ldC9ld3cuZWwgICAgICAgICAgfCAgOSArKysrKysrLS0K IHNyYy94ZGlzcC5jICAgICAgICAgICAgICB8IDI0ICsrKysrKysrKysrKysrKysrKy0tLS0t LQogMyBmaWxlcyBjaGFuZ2VkLCAyOSBpbnNlcnRpb25zKCspLCAxMCBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9kb2MvbGlzcHJlZi9kaXNwbGF5LnRleGkgYi9kb2MvbGlzcHJlZi9k aXNwbGF5LnRleGkKaW5kZXggMzQwOTYxOTZkZjQuLjY3YjY0ZGY3NWZkIDEwMDY0NAotLS0g YS9kb2MvbGlzcHJlZi9kaXNwbGF5LnRleGkKKysrIGIvZG9jL2xpc3ByZWYvZGlzcGxheS50 ZXhpCkBAIC01MTgyLDggKzUxODIsMTAgQEAgRGlzcGxheSBQcm9wZXJ0eQogVGhpcyBjb252 ZW5pZW5jZSBmdW5jdGlvbiBjYW4gYmUgdXNlZCB0byBnZXQgYSBzcGVjaWZpYyBkaXNwbGF5 CiBwcm9wZXJ0eSwgbm8gbWF0dGVyIHdoZXRoZXIgdGhlIEBjb2Rle2Rpc3BsYXl9IHByb3Bl cnR5IGlzIGEgdmVjdG9yLCBhCiBsaXN0IG9yIGEgc2ltcGxlIHByb3BlcnR5LiAgVGhpcyBp cyBsaWtlIEBjb2Rle2dldC10ZXh0LXByb3BlcnR5fQotKEBweHJlZntFeGFtaW5pbmcgUHJv cGVydGllc30pLCBidXQgd29ya3Mgb24gdGhlIEBjb2Rle2Rpc3BsYXl9Ci1wcm9wZXJ0eSBv bmx5LgorKEBweHJlZntFeGFtaW5pbmcgUHJvcGVydGllc30pLCBidXQgd29ya3Mgb24gdGhl IEBjb2Rle2Rpc3BsYXl9IHByb3BlcnR5Citvbmx5LiAgRm9yIHByb3BlcnRpZXMgd2l0aCBh IHNpbmdsZSB2YWx1ZSAoZS5nLkA6IEBjb2Rle2hlaWdodH0sIHRoaXMKK3JldHVybnMgdGhl IHZhbHVlIGl0c2VsZjsgZm9yIHByb3BlcnRpZXMgd2l0aCBhIGxpc3Qgb2YgdmFsdWVzIChl LmcuQDoKK0Bjb2Rle3NsaWNlfSksIHRoaXMgcmV0dXJucyB0aGUgbGlzdCBvZiB2YWx1ZXMu CiAKIEB2YXJ7cG9zaXRpb259IGlzIHRoZSBwb3NpdGlvbiBpbiB0aGUgYnVmZmVyIG9yIHN0 cmluZyB0byBleGFtaW5lLCBhbmQKIEB2YXJ7cHJvcH0gaXMgdGhlIEBjb2Rle2Rpc3BsYXl9 IHByb3BlcnR5IHRvIHJldHVybi4gIFRoZSBvcHRpb25hbApkaWZmIC0tZ2l0IGEvbGlzcC9u ZXQvZXd3LmVsIGIvbGlzcC9uZXQvZXd3LmVsCmluZGV4IDk0YmZkMzMzZmE5Li45MDdiMzVm ODU2NSAxMDA2NDQKLS0tIGEvbGlzcC9uZXQvZXd3LmVsCisrKyBiL2xpc3AvbmV0L2V3dy5l bApAQCAtMTM3MCw4ICsxMzcwLDEzIEBAIGV3dy0tcmVzY2FsZS1pbWFnZXMKICAgICAoc2F2 ZS1leGN1cnNpb24KICAgICAgIChnb3RvLWNoYXIgKHBvaW50LW1pbikpCiAgICAgICAod2hp bGUtbGV0ICgobWF0Y2ggKHRleHQtcHJvcGVydHktc2VhcmNoLWZvcndhcmQKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgJ2Rpc3BsYXkgbmlsIChsYW1iZGEgKF8gdmFsdWUpIChpbWFn ZXAgdmFsdWUpKSkpKQotICAgICAgICAobGV0KiAoKGltYWdlIChwcm9wLW1hdGNoLXZhbHVl IG1hdGNoKSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgJ2Rpc3BsYXkgbmlsCisgICAg ICAgICAgICAgICAgICAgICAgICAgIChsYW1iZGEgKF8gdmFsdWUpCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgKGFuZCB2YWx1ZSAoZ2V0LWRpc3BsYXktcHJvcGVydHkKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBuaWwgJ2ltYWdlIG5pbCB2YWx1 ZSkpKSkpKQorICAgICAgICAobGV0KiAoKGltYWdlIChjb25zICdpbWFnZQorICAgICAgICAg ICAgICAgICAgICAgICAgICAgIChnZXQtZGlzcGxheS1wcm9wZXJ0eSBuaWwgJ2ltYWdlIG5p bAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAo cHJvcC1tYXRjaC12YWx1ZSBtYXRjaCkpKSkKICAgICAgICAgICAgICAgIChvcmlnaW5hbC1z Y2FsZSAob3IgKGltYWdlLXByb3BlcnR5IGltYWdlIDpvcmlnaW5hbC1zY2FsZSkKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKHNldGYgKGltYWdlLXByb3BlcnR5IGlt YWdlIDpvcmlnaW5hbC1zY2FsZSkKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgKG9yIChpbWFnZS1wcm9wZXJ0eSBpbWFnZSA6c2NhbGUpCmRpZmYgLS1naXQg YS9zcmMveGRpc3AuYyBiL3NyYy94ZGlzcC5jCmluZGV4IDE4YWM1YjY5ZDdlLi44YzdlOGU1 Y2I0MyAxMDA2NDQKLS0tIGEvc3JjL3hkaXNwLmMKKysrIGIvc3JjL3hkaXNwLmMKQEAgLTU1 NDksNiArNTU0OSw3IEBAIHNldHVwX2Zvcl9lbGxpcHNpcyAoc3RydWN0IGl0ICppdCwgaW50 IGxlbikKIHN0YXRpYyBMaXNwX09iamVjdAogZmluZF9kaXNwbGF5X3Byb3BlcnR5IChMaXNw X09iamVjdCBkaXNwLCBMaXNwX09iamVjdCBwcm9wKQogeworICBMaXNwX09iamVjdCBlbGVt OwogICBpZiAoTklMUCAoZGlzcCkpCiAgICAgcmV0dXJuIFFuaWw7CiAgIC8qIFdlIGhhdmUg YSB2ZWN0b3Igb2YgZGlzcGxheSBzcGVjcy4gICovCkBAIC01NTU2LDExICs1NTU3LDExIEBA IGZpbmRfZGlzcGxheV9wcm9wZXJ0eSAoTGlzcF9PYmplY3QgZGlzcCwgTGlzcF9PYmplY3Qg cHJvcCkKICAgICB7CiAgICAgICBmb3IgKHB0cmRpZmZfdCBpID0gMDsgaSA8IEFTSVpFIChk aXNwKTsgaSsrKQogCXsKLQkgIExpc3BfT2JqZWN0IGVsZW0gPSBBUkVGIChkaXNwLCBpKTsK KwkgIGVsZW0gPSBBUkVGIChkaXNwLCBpKTsKIAkgIGlmIChDT05TUCAoZWxlbSkKIAkgICAg ICAmJiBDT05TUCAoWENEUiAoZWxlbSkpCiAJICAgICAgJiYgRVEgKFhDQVIgKGVsZW0pLCBw cm9wKSkKLQkgICAgcmV0dXJuIFhDQVIgKFhDRFIgKGVsZW0pKTsKKwkgICAgZ290byBmb3Vu ZDsKIAl9CiAgICAgICByZXR1cm4gUW5pbDsKICAgICB9CkBAIC01NTcwLDExICs1NTcxLDEx IEBAIGZpbmRfZGlzcGxheV9wcm9wZXJ0eSAoTGlzcF9PYmplY3QgZGlzcCwgTGlzcF9PYmpl Y3QgcHJvcCkKICAgICB7CiAgICAgICB3aGlsZSAoIU5JTFAgKGRpc3ApKQogCXsKLQkgIExp c3BfT2JqZWN0IGVsZW0gPSBYQ0FSIChkaXNwKTsKKwkgIGVsZW0gPSBYQ0FSIChkaXNwKTsK IAkgIGlmIChDT05TUCAoZWxlbSkKIAkgICAgICAmJiBDT05TUCAoWENEUiAoZWxlbSkpCiAJ ICAgICAgJiYgRVEgKFhDQVIgKGVsZW0pLCBwcm9wKSkKLQkgICAgcmV0dXJuIFhDQVIgKFhD RFIgKGVsZW0pKTsKKwkgICAgZ290byBmb3VuZDsKIAogCSAgLyogQ2hlY2sgdGhhdCB3ZSBo YXZlIGEgcHJvcGVyIGxpc3QgYmVmb3JlIGdvaW5nIHRvIHRoZSBuZXh0CiAJICAgICBlbGVt ZW50LiAgKi8KQEAgLTU1ODksOSArNTU5MCwyMCBAQCBmaW5kX2Rpc3BsYXlfcHJvcGVydHkg KExpc3BfT2JqZWN0IGRpc3AsIExpc3BfT2JqZWN0IHByb3ApCiAgIGVsc2UgaWYgKENPTlNQ IChkaXNwKQogCSAgICYmIENPTlNQIChYQ0RSIChkaXNwKSkKIAkgICAmJiBFUSAoWENBUiAo ZGlzcCksIHByb3ApKQotICAgIHJldHVybiBYQ0FSIChYQ0RSIChkaXNwKSk7CisgICAgewor ICAgICAgZWxlbSA9IGRpc3A7CisgICAgICBnb3RvIGZvdW5kOworICAgIH0KKworICByZXR1 cm4gUW5pbDsKKworIGZvdW5kOgorICAvKiBJZiB0aGUgcHJvcGVydHkgdmFsdWUgaXMgYSBs aXN0IG9mIG9uZSBlbGVtZW50LCBqdXN0IHJldHVybiB0aGUKKyAgICAgQ0FSLiAqLworICBp ZiAoTklMUCAoWENEUiAoWENEUiAoZWxlbSkpKSkKKyAgICByZXR1cm4gWENBUiAoWENEUiAo ZWxlbSkpOwogICBlbHNlCi0gICAgcmV0dXJuIFFuaWw7CisgICAgcmV0dXJuIFhDRFIgKGVs ZW0pOwogfQogCiBzdGF0aWMgTGlzcF9PYmplY3QKLS0gCjIuMjUuMQoK --------------EkNC3ywtaPqTsXZOQMQw9xnA--