From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: martin rudalics Newsgroups: gmane.emacs.bugs Subject: bug#52493: 29.0.50; Setting Inconsolata up in init.el makes default face rendered wrong Date: Wed, 28 Dec 2022 18:35:51 +0100 Message-ID: <9bc9f6fe-4fe6-1f75-42db-3a9c3e84d851@gmx.at> References: <80e7f515-e16f-5ce8-86a3-e5f47cd2d2f5@yandex.ru> <2f876c63-d9f5-4dbe-6d82-5d46eb73118d@gmx.at> <8ca8c5c6-c8a1-bf48-a9e6-1e16935de2d6@yandex.ru> <357a553a-7a5d-9bae-f725-14366b07f52f@yandex.ru> <6889e78d-c296-1d5a-a0d3-66ad2b7a6b09@gmx.at> <92bbfa58-b920-04b9-078b-474fd917daf6@yandex.ru> <0c2d9115-8cec-0870-2ac3-38b8c17a0575@gmx.at> <83abf08e-44d9-8a05-f746-5f6a8469ab02@yandex.ru> <503acc7f-8b06-3ce2-71b0-9f97e8de1966@gmx.at> <66cb788c-6b49-c408-0168-0492e7f8d7ad@gmx.at> <266ad500-da74-13a5-2434-81bd3d5b3554@yandex.ru> <66499633-3283-3cb2-2322-77a357a3c1b7@gmx.at> <1c8f744b-2c71-d6b3-39be-86185ea3650b@yandex.ru> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------ubUnYWYbas1BESzSMpyUY3yE" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="19885"; mail-complaints-to="usenet@ciao.gmane.io" Cc: rpluim@gmail.com, 52493@debbugs.gnu.org To: Dmitry Gutov , Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Wed Dec 28 18:37:47 2022 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 1pAaN9-0004xJ-Ad for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 28 Dec 2022 18:37:47 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pAaMq-0006sk-J3; Wed, 28 Dec 2022 12:37:28 -0500 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 1pAaMS-0006nC-DV for bug-gnu-emacs@gnu.org; Wed, 28 Dec 2022 12:37:12 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pAaMQ-0000G7-7o for bug-gnu-emacs@gnu.org; Wed, 28 Dec 2022 12:37:03 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pAaMP-0003ZK-Nb for bug-gnu-emacs@gnu.org; Wed, 28 Dec 2022 12:37:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: martin rudalics Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 28 Dec 2022 17:37:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52493 X-GNU-PR-Package: emacs Original-Received: via spool by 52493-submit@debbugs.gnu.org id=B52493.167224896113634 (code B ref 52493); Wed, 28 Dec 2022 17:37:01 +0000 Original-Received: (at 52493) by debbugs.gnu.org; 28 Dec 2022 17:36:01 +0000 Original-Received: from localhost ([127.0.0.1]:58563 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pAaLR-0003XY-4n for submit@debbugs.gnu.org; Wed, 28 Dec 2022 12:36:01 -0500 Original-Received: from mout.gmx.net ([212.227.15.18]:40491) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pAaLP-0003XH-0s for 52493@debbugs.gnu.org; Wed, 28 Dec 2022 12:35:59 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.at; s=s31663417; t=1672248952; bh=6LMocXglMxKxI8bT/JMbGdXctdsMzcm+a6IydATaDzw=; h=X-UI-Sender-Class:Date:Subject:To:Cc:References:From:In-Reply-To; b=BHpSZ+pEJVZaqMlFy03/NEPZO3GsmUy599Z0E9e37QOyPUgIpuRjMC58BRm+zSuCt YSmm9fuSrmE7e+xtSc5yDe0tiMevRMg1w6Yh5DiaoLmGGI18EQvNobL708XOsnAKfG 2MAQPu3AfV5XLnnp1i26J9n58cwaDtmHj8pgVN81sBZjoD9rx8enPWpSvsDcEcslrk Eua/Tu+WgpHCyD+Es97Px2clcxzfQB01QveMvI+9F23NphsJKC9kVvAx80Ml1aBrNw gpxY5s0X1f+QnSJRfirZAPvPRXg2b/BkK8UZrf7S774wq5DLwqWBg0rb1zYK1UMJi1 Rh17ldS/D6tGQ== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Original-Received: from [192.168.1.102] ([213.142.97.85]) by mail.gmx.net (mrgmx005 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MjS9I-1oR1yU1iGY-00l0EO; Wed, 28 Dec 2022 18:35:52 +0100 Content-Language: en-US In-Reply-To: <1c8f744b-2c71-d6b3-39be-86185ea3650b@yandex.ru> X-Provags-ID: V03:K1:assSY8PWuIG8VExTu7UrNWLtNMGEsw9iDqfrzs6VHia/9DxrB4L P+ZkGOXWYjtVkGNuZW9TiIEU8Lgvlxd+6+x5QuVVQTumTFB/vW7+uSpqlm2bW23G8nB3bwS uKNhloOAkxXK7ElPyn4jVoQJ3iTiSAcXlLzcHqIBuAWXpnNEy67UnMHKeLna+V3uIO0+yIS CYQmQwOfGguthFWjPpupA== UI-OutboundReport: notjunk:1;M01:P0:WuxX0paeqPg=;Svzbjdkar8b9nn86ciDp3DyicMW sIGu66IewXuXq1Lb5MLh6ilCbswnREBn34JYoP01DJrjdd8lT0jYVaOoQxgbcNjAepKYIlRCV abC8K4ZzafcWGfej1wIYa/Hlo1lw7VzUbBfBYn+KwCjRZqeEJkRx5Uo40VuJxe9tfMZqHSwZv 4oZKJwBkjS9nM9bJ5qXpkq6MaoEHcQiuLcUn98b4omNDeCeWZTRipdE0k/aYDNmOxXdh19Jch C2AhlYh9Vha8VaEaQXab2klpj/2mIxeRAEvEbfFhn/PFSt37gc/eqxVOHRoOEZK3esh0UK1J5 Gzoi/ik4F8W/GeiYw3Jlvo6Hj6d0WIkJyIm5wP68coLfrVVyQVHZbJIfFXNtg6cZG/qqdGNE4 3omJdtpEVVl67DRtzRBo2FhybV6YqtvoHlRMrGh7gVYNZJSazsFUoxdMMZbmDHa9xyOJyeUZg XZfP/Q6TJ21LQlbbG7lAqKCt4FCYohAt3mzV5hl7YSg16IQTOQYVNO1d8tsNyx+RqM/EQnLWm YeK6ksbwKr5E5Y5wi3/twZfQq5OKdXsK9MB7pjXJtc+5F7I8DShsBP+P5582BMPOj/k9vtK/C eihOjKoubtDDI48Zd6FxSUr67g00JFaMrFdBg+7RQCMWPnmVfFmqptcVLcGJsCKvGK24He+Qd q3nXFrfjBg4JHi2D5dbceA4yp1LK2lKPELnKB4Ou3NxTby+o80mpkZXj8c1g6lm61uSAA8W7P 2zv83b5ud7hFJB7EpWAXbofCcZpAxshOeX7jkWmHf9sLzzWzu7RVZOfry0e3du5iMu6fGzSV 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:251994 Archived-At: This is a multi-part message in MIME format. --------------ubUnYWYbas1BESzSMpyUY3yE Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit > It certainly does work. One of the changes I saw right away is the > width of the frame right after startup with my config increased from > 84 to 90 columns. What are you asking for in your configuration? > Not sure if it's good or bad, so let's go back to > the behavior with '-Q'. > > The height stopped shrinking. > > The width started growing. :-D Repeatedly? > I don't know if *foo* is helpful here yet, but here you go: Not for the width. But that's another issue. If mutter complains about the width not conforming to the (+ base_width (* width_inc N)) rule, then we have already lost when the sum of fringes and scroll bar is not a multiple of the frame's column width. Which means, you get a "wrong" size without any scaling and you may be lucky if that scaling does not propagate during further 'set-face-attribute' calls. Does each setting of 'set-face-attribute' increase the width or is it just the first one? Strictly spoken, Emacs is wrong here and mutter is right. But fixing this is quite involved since we'd have to disentangle those insane FRAME_TEXT_COLS_TO_PIXEL_WIDTH and FRAME_TEXT_LINES_TO_PIXEL_HEIGHT macros into xg_frame_set_char_size which would constitute a real pain. More precisely, we'd have to treat scroll bars, fringes and internal border like menu and toolbar and count them into the base_width value. Try the attached which should work for any scaling and tell me what happens now - in particular what the initial frame size is and whether the frame grows or shrinks repeatedly. martin --------------ubUnYWYbas1BESzSMpyUY3yE Content-Type: text/x-patch; charset=UTF-8; name="x_scale_font.diff" Content-Disposition: attachment; filename="x_scale_font.diff" Content-Transfer-Encoding: base64 ZGlmZiAtLWdpdCBhL2xpc3Avd2luZG93LmVsIGIvbGlzcC93aW5kb3cuZWwKaW5kZXggYTEx MjkzZDM3Mi4uM2QwNjRlMTJkNyAxMDA2NDQKLS0tIGEvbGlzcC93aW5kb3cuZWwKKysrIGIv bGlzcC93aW5kb3cuZWwKQEAgLTEwNTk2LDYgKzEwNTk2LDE3IEBAIHdpbmRvdy1wcmVmaXgt bWFwCiAgICIwIiAjJ2RlbGV0ZS13aW5kb3dzLW9uKQogKGRlZmluZS1rZXkgY3RsLXgtbWFw ICJ3IiB3aW5kb3ctcHJlZml4LW1hcCkKIAorKGRlZnVuIGZvby1pdCAoJnJlc3QgcmVzdCkK KyAgKHdpdGgtY3VycmVudC1idWZmZXIgKGdldC1idWZmZXItY3JlYXRlICIqZm9vKiIpCisg ICAgKGdvdG8tY2hhciAocG9pbnQtbWF4KSkKKyAgICAod2hlbiByZXN0CisgICAgICAoaW5z ZXJ0IChmb3JtYXQgIiVzIiAoY2FyIHJlc3QpKSkKKyAgICAgIChzZXRxIHJlc3QgKGNkciBy ZXN0KSkKKyAgICAgICh3aGlsZSByZXN0CisJKGluc2VydCAoZm9ybWF0ICIgLi4gJXMiIChj YXIgcmVzdCkpKQorCShzZXRxIHJlc3QgKGNkciByZXN0KSkpCisgICAgICAoaW5zZXJ0ICJc biIpKSkpCisKIChwcm92aWRlICd3aW5kb3cpCiAKIDs7OyB3aW5kb3cuZWwgZW5kcyBoZXJl CmRpZmYgLS1naXQgYS9zcmMvZnJhbWUuYyBiL3NyYy9mcmFtZS5jCmluZGV4IGI1N2IyOTZi ZTUuLjQ1MDFjOGRjMTQgMTAwNjQ0Ci0tLSBhL3NyYy9mcmFtZS5jCisrKyBiL3NyYy9mcmFt ZS5jCkBAIC05MDYsNiArOTA2LDE0IEBAIGFkanVzdF9mcmFtZV9zaXplIChzdHJ1Y3QgZnJh bWUgKmYsIGludCBuZXdfdGV4dF93aWR0aCwgaW50IG5ld190ZXh0X2hlaWdodCwKIAogICB1 bmJsb2NrX2lucHV0ICgpOwogCisgIGlmIChvbGRfbmF0aXZlX2hlaWdodCAhPSBuZXdfbmF0 aXZlX2hlaWdodAorICAgICAgfHwgb2xkX3RleHRfbGluZXMgIT0gbmV3X3RleHRfbGluZXMp CisgICAgY2FsbDcgKFFmb29faXQsIGludGVybiAoImFkanVzdF9mcmFtZV9zaXplIiksCisJ ICAgaW50ZXJuICgib2xkIHBpeGVscy9saW5lcyIpLCBtYWtlX2ZpeG51bSAob2xkX25hdGl2 ZV9oZWlnaHQpLAorCSAgIG1ha2VfZml4bnVtIChvbGRfdGV4dF9saW5lcyksCisJICAgaW50 ZXJuICgibmV3IHBpeGVscy9saW5lcyIpLCBtYWtlX2ZpeG51bSAobmV3X25hdGl2ZV9oZWln aHQpLAorCSAgIG1ha2VfZml4bnVtIChuZXdfdGV4dF9saW5lcykpOworCiAjaWZkZWYgSEFW RV9XSU5ET1dfU1lTVEVNCiAgIHsKICAgICAvKiBBZGp1c3Qgc2l6ZSBvZiBGJ3MgY2hpbGQg ZnJhbWVzLiAgKi8KZGlmZiAtLWdpdCBhL3NyYy9ndGt1dGlsLmMgYi9zcmMvZ3RrdXRpbC5j CmluZGV4IGE2YmJhMDk2YTQuLmNhZDMzNzU1MmYgMTAwNjQ0Ci0tLSBhL3NyYy9ndGt1dGls LmMKKysrIGIvc3JjL2d0a3V0aWwuYwpAQCAtMTE0OSw2ICsxMTQ5LDEzIEBAIHhnX2ZyYW1l X3Jlc2l6ZWQgKHN0cnVjdCBmcmFtZSAqZiwgaW50IHdpZHRoLCBpbnQgaGVpZ2h0KQogCSAg IGYtPm5ld19zaXplX3AgPyBmLT5uZXdfaGVpZ2h0IDogLTEpOwogCiAgICAgICBGUkFNRV9S SUYgKGYpLT5jbGVhcl91bmRlcl9pbnRlcm5hbF9ib3JkZXIgKGYpOworCisgICAgICBjYWxs OCAoUWZvb19pdCwgaW50ZXJuICgieGdfZnJhbWVfcmVzaXplZCIpLAorCSAgICAgaW50ZXJu ICgib2xkIiksIG1ha2VfZml4bnVtIChGUkFNRV9QSVhFTF9IRUlHSFQgKGYpKSwKKwkgICAg IGludGVybiAoInJlcSIpLCBtYWtlX2ZpeG51bSAoZi0+bmV3X2hlaWdodCksCisJICAgICBp bnRlcm4gKCJjb24vdGV4dCIpLCBtYWtlX2ZpeG51bSAoaGVpZ2h0KSwKKwkgICAgIG1ha2Vf Zml4bnVtIChGUkFNRV9QSVhFTF9UT19URVhUX0hFSUdIVCAoZiwgaGVpZ2h0KSkpOworCiAg ICAgICBjaGFuZ2VfZnJhbWVfc2l6ZSAoZiwgd2lkdGgsIGhlaWdodCwgZmFsc2UsIHRydWUs IGZhbHNlKTsKICAgICAgIFNFVF9GUkFNRV9HQVJCQUdFRCAoZik7CiAgICAgICBjYW5jZWxf bW91c2VfZmFjZSAoZik7CkBAIC0xMTc0LDYgKzExODEsMTcgQEAgeGdfZnJhbWVfc2V0X2No YXJfc2l6ZSAoc3RydWN0IGZyYW1lICpmLCBpbnQgd2lkdGgsIGludCBoZWlnaHQpCiAgIGlu dCBvdXRlcl93aWR0aCA9IHdpZHRoICsgRlJBTUVfVE9PTEJBUl9XSURUSCAoZik7CiAgIGJv b2wgd2FzX3Zpc2libGUgPSBmYWxzZTsKICAgYm9vbCBoaWRlX2NoaWxkX2ZyYW1lOworICBp bnQgc2NhbGUgPSB4Z19nZXRfc2NhbGUgKGYpOworCisgIGlmIChzY2FsZSAhPSAxICYmICFm cmFtZV9yZXNpemVfcGl4ZWx3aXNlKQorICAgIHsKKyAgICAgIHdpZHRoID0gd2lkdGggKyAo d2lkdGggJSAoRlJBTUVfQ09MVU1OX1dJRFRIIChmKSAvIHNjYWxlKSk7CisgICAgICBvdXRl cl93aWR0aCA9IHdpZHRoICsgRlJBTUVfVE9PTEJBUl9XSURUSCAoZik7CisKKyAgICAgIGhl aWdodCA9IGhlaWdodCArIChoZWlnaHQgJSAoRlJBTUVfTElORV9IRUlHSFQgKGYpIC8gc2Nh bGUpKTsKKyAgICAgIG91dGVyX2hlaWdodAorCT0gaGVpZ2h0ICsgRlJBTUVfVE9PTEJBUl9I RUlHSFQgKGYpICsgRlJBTUVfTUVOVUJBUl9IRUlHSFQgKGYpOworICAgIH0KIAogI2lmbmRl ZiBIQVZFX1BHVEsKICAgZ3RrX3dpbmRvd19nZXRfc2l6ZSAoR1RLX1dJTkRPVyAoRlJBTUVf R1RLX09VVEVSX1dJREdFVCAoZikpLApAQCAtMTE5Niw4ICsxMjE0LDggQEAgeGdfZnJhbWVf c2V0X2NoYXJfc2l6ZSAoc3RydWN0IGZyYW1lICpmLCBpbnQgd2lkdGgsIGludCBoZWlnaHQp CiAgIC8qIERvIHRoaXMgYmVmb3JlIHJlc2l6ZSwgYXMgd2UgZG9uJ3Qga25vdyB5ZXQgaWYg d2Ugd2lsbCBiZSByZXNpemVkLiAgKi8KICAgRlJBTUVfUklGIChmKS0+Y2xlYXJfdW5kZXJf aW50ZXJuYWxfYm9yZGVyIChmKTsKIAotICBvdXRlcl9oZWlnaHQgLz0geGdfZ2V0X3NjYWxl IChmKTsKLSAgb3V0ZXJfd2lkdGggLz0geGdfZ2V0X3NjYWxlIChmKTsKKyAgb3V0ZXJfaGVp Z2h0IC89IHNjYWxlOworICBvdXRlcl93aWR0aCAvPSBzY2FsZTsKIAogICB4Z193bV9zZXRf c2l6ZV9oaW50IChmLCAwLCAwKTsKIApAQCAtMTMxNyw2ICsxMzM1LDE0IEBAIHhnX2ZyYW1l X3NldF9jaGFyX3NpemUgKHN0cnVjdCBmcmFtZSAqZiwgaW50IHdpZHRoLCBpbnQgaGVpZ2h0 KQogICBTRVRfRlJBTUVfR0FSQkFHRUQgKGYpOwogICBjYW5jZWxfbW91c2VfZmFjZSAoZik7 CiAKKyAgY2FsbDcgKFFmb29faXQsIGludGVybiAoInhnX2ZyYW1lX3NldF9jaGFyX3NpemUi KSwKKwkgaW50ZXJuICgib2xkIiksIG1ha2VfZml4bnVtIChGUkFNRV9QSVhFTF9IRUlHSFQg KGYpKSwKKwkgaW50ZXJuICgiYXJnIiksIG1ha2VfZml4bnVtIChoZWlnaHQpLAorCSBpbnRl cm4gKCJuZXciKSwgbWFrZV9maXhudW0gKGYtPm5ld19oZWlnaHQpKTsKKyAgY2FsbDQgKFFm b29faXQsCisJIGludGVybiAoIiAgb3V0ZXIiKSwgbWFrZV9maXhudW0gKG91dGVyX2hlaWdo dCksCisJIGludGVybiAoImdoZWlnaHQiKSwgbWFrZV9maXhudW0gKGdoZWlnaHQpKTsKKwog ICAvKiBXZSBjYW4gbm90IGNhbGwgY2hhbmdlX2ZyYW1lX3NpemUgZm9yIGEgbWFwcGVkIGZy YW1lLAogICAgICB3ZSBjYW4gbm90IHNldCBwaXhlbCB3aWR0aC9oZWlnaHQgZWl0aGVyLiAg VGhlIHdpbmRvdyBtYW5hZ2VyIG1heQogICAgICBvdmVycmlkZSBvdXIgcmVzaXplIHJlcXVl c3QsIFhNb25hZCBkb2VzIHRoaXMgYWxsIHRoZSB0aW1lLgpAQCAtMjAyOCw2ICsyMDU0LDEz IEBAIHhnX3dtX3NldF9zaXplX2hpbnQgKHN0cnVjdCBmcmFtZSAqZiwgbG9uZyBpbnQgZmxh Z3MsIGJvb2wgdXNlcl9wb3NpdGlvbikKIAkJICZmLT5vdXRwdXRfZGF0YS54cC0+c2l6ZV9o aW50cywKIAkJIHNpemVvZiAoc2l6ZV9oaW50cykpICE9IDApCiAgICAgeworICAgICAgY2Fs bDggKFFmb29faXQsIGludGVybiAoInhnX3dtX3NldF9zaXplX2hpbnQiKSwKKwkgICAgIGlu dGVybiAoImxpbmVfaGVpZ2h0ICYgc2NhbGUiKSwKKwkgICAgIG1ha2VfZml4bnVtIChGUkFN RV9MSU5FX0hFSUdIVCAoZikpLCBtYWtlX2ZpeG51bSAoc2NhbGUpLAorCSAgICAgaW50ZXJu ICgiYmFzZV9oZWlnaHQiKSwgbWFrZV9maXhudW0gKHNpemVfaGludHMuYmFzZV9oZWlnaHQp LAorCSAgICAgaW50ZXJuICgiaGVpZ2h0X2luYyIpLCBtYWtlX2ZpeG51bSAoc2l6ZV9oaW50 cy5oZWlnaHRfaW5jKSk7CisgICAgICBjYWxsNCAoUWZvb19pdCwgaW50ZXJuICgiICBtZW51 YmFyX2hlaWdodCIpLCBtYWtlX2ZpeG51bSAoRlJBTUVfTUVOVUJBUl9IRUlHSFQgKGYpKSwK KwkgICAgIGludGVybiAoInRvb2xiYXJfaGVpZ2h0IiksIG1ha2VfZml4bnVtIChGUkFNRV9U T09MQkFSX0hFSUdIVCAoZikpKTsKICAgICAgIGJsb2NrX2lucHV0ICgpOwogICAgICAgZ3Rr X3dpbmRvd19zZXRfZ2VvbWV0cnlfaGludHMgKEdUS19XSU5ET1cgKEZSQU1FX0dUS19PVVRF Ul9XSURHRVQgKGYpKSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBO VUxMLCAmc2l6ZV9oaW50cywgaGludF9mbGFncyk7CmRpZmYgLS1naXQgYS9zcmMvd2luZG93 LmMgYi9zcmMvd2luZG93LmMKaW5kZXggZjExNmI5YTlkNy4uYzA5MGYyOTQ2MSAxMDA2NDQK LS0tIGEvc3JjL3dpbmRvdy5jCisrKyBiL3NyYy93aW5kb3cuYwpAQCAtODM5NCw2ICs4Mzk0 LDcgQEAgc3ltc19vZl93aW5kb3cgKHZvaWQpCiAgIERFRlNZTSAoUWhlYWRlcl9saW5lX2Zv cm1hdCwgImhlYWRlci1saW5lLWZvcm1hdCIpOwogICBERUZTWU0gKFF0YWJfbGluZV9mb3Jt YXQsICJ0YWItbGluZS1mb3JtYXQiKTsKICAgREVGU1lNIChRbm9fb3RoZXJfd2luZG93LCAi bm8tb3RoZXItd2luZG93Iik7CisgIERFRlNZTSAoUWZvb19pdCwgImZvby1pdCIpOwogCiAg IERFRlZBUl9MSVNQICgidGVtcC1idWZmZXItc2hvdy1mdW5jdGlvbiIsIFZ0ZW1wX2J1ZmZl cl9zaG93X2Z1bmN0aW9uLAogCSAgICAgICBkb2M6IC8qIE5vbi1uaWwgbWVhbnMgY2FsbCBh cyBmdW5jdGlvbiB0byBkaXNwbGF5IGEgaGVscCBidWZmZXIuCmRpZmYgLS1naXQgYS9zcmMv eHRlcm0uYyBiL3NyYy94dGVybS5jCmluZGV4IDdlYWY1OWQ1NGIuLjI3N2I1MzA0M2EgMTAw NjQ0Ci0tLSBhL3NyYy94dGVybS5jCisrKyBiL3NyYy94dGVybS5jCkBAIC0yNjE5Nyw5ICsy NjE5NywxNyBAQCB4X25ld19mb250IChzdHJ1Y3QgZnJhbWUgKmYsIExpc3BfT2JqZWN0IGZv bnRfb2JqZWN0LCBpbnQgZm9udHNldCkKICAgICAgYmVjYXVzZSBpdCdzIGRvbmUgaW4gRnhf c2hvd190aXAsIGFuZCBpdCBsZWFkcyB0byBwcm9ibGVtcyBiZWNhdXNlCiAgICAgIHRoZSB0 aXAgZnJhbWUgaGFzIG5vIHdpZGdldC4gICovCiAgIGlmIChGUkFNRV9YX1dJTkRPVyAoZikg IT0gMCAmJiAhRlJBTUVfVE9PTFRJUF9QIChmKSkKLSAgICBhZGp1c3RfZnJhbWVfc2l6ZQot ICAgICAgKGYsIEZSQU1FX0NPTFMgKGYpICogRlJBTUVfQ09MVU1OX1dJRFRIIChmKSwKLSAg ICAgICBGUkFNRV9MSU5FUyAoZikgKiBGUkFNRV9MSU5FX0hFSUdIVCAoZiksIDMsIGZhbHNl LCBRZm9udCk7CisgICAgeworICAgICAgY2FsbDcgKFFmb29faXQsIGludGVybiAoInhfbmV3 X2ZvbnQiKSwKKwkgICAgIGludGVybiAoImxpbmVfaGVpZ2h0IiksIG1ha2VfZml4bnVtIChG UkFNRV9MSU5FX0hFSUdIVCAoZikpLAorCSAgICAgaW50ZXJuICgibGluZXMiKSwgbWFrZV9m aXhudW0gKEZSQU1FX0xJTkVTIChmKSksCisJICAgICBpbnRlcm4gKCJuZXdfdGV4dF9oZWln aHQiKSwKKwkgICAgIG1ha2VfZml4bnVtIChGUkFNRV9MSU5FUyAoZikgKiBGUkFNRV9MSU5F X0hFSUdIVCAoZikpKTsKKworICAgICAgYWRqdXN0X2ZyYW1lX3NpemUKKwkoZiwgRlJBTUVf Q09MUyAoZikgKiBGUkFNRV9DT0xVTU5fV0lEVEggKGYpLAorCSBGUkFNRV9MSU5FUyAoZikg KiBGUkFNRV9MSU5FX0hFSUdIVCAoZiksIDMsIGZhbHNlLCBRZm9udCk7CisgICAgfQogCiAj aWZkZWYgSEFWRV9YX0kxOE4KICAgaWYgKEZSQU1FX1hJQyAoZikK --------------ubUnYWYbas1BESzSMpyUY3yE--