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: Thu, 5 Jan 2023 17:59:47 +0100 Message-ID: <9be7030e-ce19-0baa-58b8-e2d483efab8f@gmx.at> References: <80e7f515-e16f-5ce8-86a3-e5f47cd2d2f5@yandex.ru> <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> <9bc9f6fe-4fe6-1f75-42db-3a9c3e84d851@gmx.at> <8bca33d8-55a5-9a96-2adf-cc751eed22e5@yandex.ru> <21a55a64-541d-345c-33d3-7c8eac182e83@gmx.at> <89a94819-8bdf-55a3-9167-0cc8d11215ee@yandex.ru> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------rO9cWTNa1tmc9F7lFWgRFRaP" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="7991"; 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 Thu Jan 05 18:06:00 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 1pDTgh-0001gK-QZ for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 05 Jan 2023 18:05:56 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pDTb5-00023v-OR; Thu, 05 Jan 2023 12:00:07 -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 1pDTb1-0001wN-EL for bug-gnu-emacs@gnu.org; Thu, 05 Jan 2023 12:00:03 -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 1pDTb1-0007h3-40 for bug-gnu-emacs@gnu.org; Thu, 05 Jan 2023 12:00:03 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pDTb1-0006gL-0X for bug-gnu-emacs@gnu.org; Thu, 05 Jan 2023 12:00:03 -0500 X-Loop: help-debbugs@gnu.org Resent-From: martin rudalics Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 05 Jan 2023 17:00:02 +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.167293799825627 (code B ref 52493); Thu, 05 Jan 2023 17:00:02 +0000 Original-Received: (at 52493) by debbugs.gnu.org; 5 Jan 2023 16:59:58 +0000 Original-Received: from localhost ([127.0.0.1]:52693 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pDTav-0006fH-S1 for submit@debbugs.gnu.org; Thu, 05 Jan 2023 11:59:58 -0500 Original-Received: from mout.gmx.net ([212.227.15.15]:38647) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pDTat-0006f3-D7 for 52493@debbugs.gnu.org; Thu, 05 Jan 2023 11:59:56 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.at; s=s31663417; t=1672937989; bh=zK4tE2/Y/PsJDC5h4RZ0hFEkYbj6luhkmTVQMeqI5P8=; h=X-UI-Sender-Class:Date:Subject:To:Cc:References:From:In-Reply-To; b=CKigkphHebtuk4eP24bCBRkMr/SZnXdZIp70QMd9yz+mhJF03ckHkYsueDLhLDx69 3547w9DDWq0Vo20KSNHbzeqi8mU5PIf3IvBxjgIjZFoAMC+ZWuU0wE7ony2hHOMyqs QfIEMTUczwO/mHyVJLaMMNZRQ7I2Ojnfiny7HosUIK1FryTiuXA7RQeSijZsPHsLsH yXIwvEbz3KO7LL9+GISyhk30wcX5UXOjvyTDIJ/Cp07IId+rtTm91am56DDS8bBg1g YRb0JsjhNw0p86YufL3Tch4HMqIc9KodvtGeip2NlAWx8uu5pDCGDAYrNMHu3EMtSG UsXlo3bLVXAfQ== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Original-Received: from [192.168.1.100] ([213.162.80.218]) by mail.gmx.net (mrgmx005 [212.227.17.190]) with ESMTPSA (Nemesis) id 1M26rD-1pFPXJ3b6P-002YTG; Thu, 05 Jan 2023 17:59:49 +0100 Content-Language: en-US In-Reply-To: <89a94819-8bdf-55a3-9167-0cc8d11215ee@yandex.ru> X-Provags-ID: V03:K1:nD/1XlnuqcIX5QnO47Wh7HqzI8tJ1IXKpQj+0U+0Nbvv7SozKyP iRFnSCUVjCP6ctX2sXtKNAARUm1glzZsTKyriW/jFG0ShZrIBK5jUDKPgtEXhAEfgXpmYfl Vdl1JAqWyqeCwGu0xop22SA3EXfl2dSPy+A3IrR7wDx1sr03ywmU/hHsn6mpanT4Q0fJsOQ n/JGMzt6Zrhk3RyTO0FjQ== UI-OutboundReport: notjunk:1;M01:P0:35vm8faZDYo=;i2kQEiT4fOwH6zC8BTvWgzwQM7O E0OS/l6NAgqMaLk313LNJ4spGOXdLiTMMueA3CQeFDot5oLa0g0PBNxoWWWtPBm9CtH8E/e+n PlBIdThks7CbSCDfJIkFACwn7eOh2dFJNXOgc63/E00kJomyEDNHXOSwGyZnF6xvR7WTIrTwu rbjimh3BsYnl9oABShdoqkt9VhP1fr0HaxCCND45sFl8VvUglfGtj4Vt4I/Ipte10B/0dC5L5 dS9P4PCh2IlE1wJetWN5Y5Xzot+8CRFYUW104eZ/h/eEMlZWmAGF4XMF/jhBOsHLwff3zfsDe euuP/U8xYFbGYXGGCUvNIeLP0dLSPS1ZPWyCnpbR13lF6o7205WkN00ZkSsqNk9QSQJHkOwKE 4Z1sl7SU66CZIR5+2eAQeftE9XgYeQGngev8P3Affes9Tuc8PKeIlG7mjjGgJZrq5KhIR/njm OxogGTnm5ID+bLADqD3NyhdvjsfkwfbzObI8J16/axHiM35GiuqSIQ2FSxLRIwBD7LcJ8BST6 ag8b6Ht7lZGA7URkKyS/DnOwYFtAnkARA+Vz2k0LMzpHY0Zwhdqlm7xOpA+AHogqOD4RdRaTi gPBQpSct2mATiidRQlTHCHYAhEIXHsc7vf7Uy3O5h8vcDQ0+EepU8It/x/6cQaawGr3EYaRK3 K7QHi3dgui5DqoxUSZ3TQj9ZDJsgFOM0feaWpb/YswGWjQRBMVH7gL50Fdwik34TMrk1YFwXl XRTfEiN8AZuNAaV/AZNt8Lv3KNjbhVjb2ARHO2k0P5xPAPUnTNwzLOCDocbXx9dd6y6zbap/ 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:252611 Archived-At: This is a multi-part message in MIME format. --------------rO9cWTNa1tmc9F7lFWgRFRaP Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit > I'm not seeing much of a change, if any: > > - My init script stills results in a frame 84 columns wide. > > - The frame still shrinks at certain width ranges. > > Attached are the contents of foo after doing this: > > (set-frame-width nil 102) > (set-face-attribute 'default nil :height 110 :family "InconsolataLGC") > > The second line was evaluated 5 times. Thanks. It seems that we really have to disentangle the entire size hint stuff to get reasonable outer sizes. Next patch attached. martin --------------rO9cWTNa1tmc9F7lFWgRFRaP 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 MjkzZDM3Mi4uNzA2Yzk4OGIyZSAxMDA2NDQKLS0tIGEvbGlzcC93aW5kb3cuZWwKKysrIGIv bGlzcC93aW5kb3cuZWwKQEAgLTEwNTk2LDYgKzEwNTk2LDIxIEBAIHdpbmRvdy1wcmVmaXgt bWFwCiAgICIwIiAjJ2RlbGV0ZS13aW5kb3dzLW9uKQogKGRlZmluZS1rZXkgY3RsLXgtbWFw ICJ3IiB3aW5kb3ctcHJlZml4LW1hcCkKIAorKGRlZnVuIGZvby1pdCAoJnJlc3QgcmVzdCkK KyAgKHdpdGgtY3VycmVudC1idWZmZXIgKGdldC1idWZmZXItY3JlYXRlICIqZm9vKiIpCisg ICAgKGdvdG8tY2hhciAocG9pbnQtbWF4KSkKKyAgICAod2hlbiByZXN0CisgICAgICAoaWYg KGNvbnNwIChjYXIgcmVzdCkpCisgICAgICAgICAgKGluc2VydCAoZm9ybWF0ICIlc3glcyIg KGNhYXIgcmVzdCkgKGNkYXIgcmVzdCkpKQorICAgICAgICAoaW5zZXJ0IChmb3JtYXQgIiVz IiAoY2FyIHJlc3QpKSkpCisgICAgICAoc2V0cSByZXN0IChjZHIgcmVzdCkpCisgICAgICAo d2hpbGUgcmVzdAorICAgICAgICAoaWYgKGNvbnNwIChjYXIgcmVzdCkpCisgICAgICAgICAg ICAoaW5zZXJ0IChmb3JtYXQgIiAlc3glcyIgKGNhYXIgcmVzdCkgKGNkYXIgcmVzdCkpKQor CSAgKGluc2VydCAoZm9ybWF0ICIgJXMiIChjYXIgcmVzdCkpKSkKKwkoc2V0cSByZXN0IChj ZHIgcmVzdCkpKQorICAgICAgKGluc2VydCAiXG4iKSkpKQorCiAocHJvdmlkZSAnd2luZG93 KQogCiA7Ozsgd2luZG93LmVsIGVuZHMgaGVyZQpkaWZmIC0tZ2l0IGEvc3JjL2ZyYW1lLmMg Yi9zcmMvZnJhbWUuYwppbmRleCBiNTdiMjk2YmU1Li5kN2QwNjlkOTA4IDEwMDY0NAotLS0g YS9zcmMvZnJhbWUuYworKysgYi9zcmMvZnJhbWUuYwpAQCAtOTA2LDYgKzkwNiwzMiBAQCBh ZGp1c3RfZnJhbWVfc2l6ZSAoc3RydWN0IGZyYW1lICpmLCBpbnQgbmV3X3RleHRfd2lkdGgs IGludCBuZXdfdGV4dF9oZWlnaHQsCiAKICAgdW5ibG9ja19pbnB1dCAoKTsKIAorICBpZiAo b2xkX25hdGl2ZV93aWR0aCAhPSBuZXdfbmF0aXZlX3dpZHRoCisgICAgICB8fCBvbGRfbmF0 aXZlX2hlaWdodCAhPSBuZXdfbmF0aXZlX2hlaWdodAorICAgICAgfHwgb2xkX3RleHRfd2lk dGggIT0gbmV3X3RleHRfd2lkdGgKKyAgICAgIHx8IG9sZF90ZXh0X2hlaWdodCAhPSBuZXdf dGV4dF9oZWlnaHQKKyAgICAgIHx8IG9sZF90ZXh0X2NvbHMgIT0gbmV3X3RleHRfY29scwor ICAgICAgfHwgb2xkX3RleHRfbGluZXMgIT0gbmV3X3RleHRfbGluZXMpCisgICAgQ0FMTE4g KEZmdW5jYWxsLCBRZm9vX2l0LCBpbnRlcm4gKCJhZGp1c3RfZnJhbWVfc2l6ZSIpLAorCSAg IGludGVybiAoIm9sZCBuYXRpdmUgcGl4ZWxzIiksCisJICAgRmNvbnMgKG1ha2VfZml4bnVt IChvbGRfbmF0aXZlX3dpZHRoKSwKKwkJICBtYWtlX2ZpeG51bSAob2xkX25hdGl2ZV9oZWln aHQpKSwKKwkgICBpbnRlcm4gKCJuZXcgbmF0aXZlIHBpeGVscyIpLAorCSAgIEZjb25zICht YWtlX2ZpeG51bSAobmV3X25hdGl2ZV93aWR0aCksCisJCSAgbWFrZV9maXhudW0gKG5ld19u YXRpdmVfaGVpZ2h0KSksCisJICAgaW50ZXJuICgib2xkIHRleHQgcGl4ZWxzIiksCisJICAg RmNvbnMgKG1ha2VfZml4bnVtIChvbGRfdGV4dF93aWR0aCksCisJCSAgbWFrZV9maXhudW0g KG9sZF90ZXh0X2hlaWdodCkpLAorCSAgIGludGVybiAoIm5ldyB0ZXh0IHBpeGVscyIpLAor CSAgIEZjb25zIChtYWtlX2ZpeG51bSAobmV3X3RleHRfd2lkdGgpLAorCQkgIG1ha2VfZml4 bnVtIChuZXdfdGV4dF9oZWlnaHQpKSwKKwkgICBpbnRlcm4gKCJvbGQgdGV4dCBjaGFycyIp LAorCSAgIEZjb25zIChtYWtlX2ZpeG51bSAob2xkX3RleHRfY29scyksCisJCSAgbWFrZV9m aXhudW0gKG9sZF90ZXh0X2xpbmVzKSksCisJICAgaW50ZXJuICgibmV3IHRleHQgY2hhcnMi KSwKKwkgICBGY29ucyAobWFrZV9maXhudW0gKG5ld190ZXh0X2NvbHMpLAorCQkgIG1ha2Vf Zml4bnVtIChuZXdfdGV4dF9saW5lcykpKTsKKwogI2lmZGVmIEhBVkVfV0lORE9XX1NZU1RF TQogICB7CiAgICAgLyogQWRqdXN0IHNpemUgb2YgRidzIGNoaWxkIGZyYW1lcy4gICovCmRp ZmYgLS1naXQgYS9zcmMvZ3RrdXRpbC5jIGIvc3JjL2d0a3V0aWwuYwppbmRleCBhNmJiYTA5 NmE0Li4wYzhmMDhlYjY1IDEwMDY0NAotLS0gYS9zcmMvZ3RrdXRpbC5jCisrKyBiL3NyYy9n dGt1dGlsLmMKQEAgLTExNDksNiArMTE0OSwxNCBAQCB4Z19mcmFtZV9yZXNpemVkIChzdHJ1 Y3QgZnJhbWUgKmYsIGludCB3aWR0aCwgaW50IGhlaWdodCkKIAkgICBmLT5uZXdfc2l6ZV9w ID8gZi0+bmV3X2hlaWdodCA6IC0xKTsKIAogICAgICAgRlJBTUVfUklGIChmKS0+Y2xlYXJf dW5kZXJfaW50ZXJuYWxfYm9yZGVyIChmKTsKKworICAgICAgQ0FMTE4gKEZmdW5jYWxsLCBR Zm9vX2l0LCBpbnRlcm4gKCJ4Z19mcmFtZV9yZXNpemVkIiksCisJICAgICBpbnRlcm4gKCJv bGQgbmF0aXZlIHBpeGVscyIpLAorCSAgICAgRmNvbnMgKG1ha2VfZml4bnVtIChGUkFNRV9Q SVhFTF9XSURUSCAoZikpLAorCQkgICAgbWFrZV9maXhudW0gKEZSQU1FX1BJWEVMX0hFSUdI VCAoZikpKSwKKwkgICAgIGludGVybiAoIm5ldyBuYXRpdmUgcGl4ZWxzIiksCisJICAgICBG Y29ucyAobWFrZV9maXhudW0gKHdpZHRoKSwgbWFrZV9maXhudW0gKGhlaWdodCkpKTsKKwog ICAgICAgY2hhbmdlX2ZyYW1lX3NpemUgKGYsIHdpZHRoLCBoZWlnaHQsIGZhbHNlLCB0cnVl LCBmYWxzZSk7CiAgICAgICBTRVRfRlJBTUVfR0FSQkFHRUQgKGYpOwogICAgICAgY2FuY2Vs X21vdXNlX2ZhY2UgKGYpOwpAQCAtMTE3NCw2ICsxMTgyLDggQEAgeGdfZnJhbWVfc2V0X2No YXJfc2l6ZSAoc3RydWN0IGZyYW1lICpmLCBpbnQgd2lkdGgsIGludCBoZWlnaHQpCiAgIGlu dCBvdXRlcl93aWR0aCA9IHdpZHRoICsgRlJBTUVfVE9PTEJBUl9XSURUSCAoZik7CiAgIGJv b2wgd2FzX3Zpc2libGUgPSBmYWxzZTsKICAgYm9vbCBoaWRlX2NoaWxkX2ZyYW1lOworICBp bnQgc2NhbGUgPSB4Z19nZXRfc2NhbGUgKGYpOworICBHZGtHZW9tZXRyeSBzaXplX2hpbnRz ID0gZi0+b3V0cHV0X2RhdGEueHAtPnNpemVfaGludHM7CiAKICNpZm5kZWYgSEFWRV9QR1RL CiAgIGd0a193aW5kb3dfZ2V0X3NpemUgKEdUS19XSU5ET1cgKEZSQU1FX0dUS19PVVRFUl9X SURHRVQgKGYpKSwKQEAgLTExOTYsOCArMTIwNiwzNiBAQCB4Z19mcmFtZV9zZXRfY2hhcl9z aXplIChzdHJ1Y3QgZnJhbWUgKmYsIGludCB3aWR0aCwgaW50IGhlaWdodCkKICAgLyogRG8g dGhpcyBiZWZvcmUgcmVzaXplLCBhcyB3ZSBkb24ndCBrbm93IHlldCBpZiB3ZSB3aWxsIGJl IHJlc2l6ZWQuICAqLwogICBGUkFNRV9SSUYgKGYpLT5jbGVhcl91bmRlcl9pbnRlcm5hbF9i b3JkZXIgKGYpOwogCi0gIG91dGVyX2hlaWdodCAvPSB4Z19nZXRfc2NhbGUgKGYpOwotICBv dXRlcl93aWR0aCAvPSB4Z19nZXRfc2NhbGUgKGYpOworICBvdXRlcl9oZWlnaHQgLz0gc2Nh bGU7CisgIG91dGVyX3dpZHRoIC89IHNjYWxlOworCisgIGlmIChzY2FsZSAhPSAxICYmICFm cmFtZV9yZXNpemVfcGl4ZWx3aXNlKQorICAgIHsKKyAgICAgIGludCBiYXNlX3dpZHRoID0g KEZSQU1FX1RFWFRfQ09MU19UT19QSVhFTF9XSURUSCAoZiwgMSkKKwkJCSsgRlJBTUVfVE9P TEJBUl9XSURUSCAoZikpIC8gc2NhbGU7CisgICAgICBpbnQgYmFzZV9oZWlnaHQgPSAoRlJB TUVfVEVYVF9MSU5FU19UT19QSVhFTF9IRUlHSFQgKGYsIDEpCisJCQkgKyBGUkFNRV9NRU5V QkFSX0hFSUdIVCAoZikKKwkJCSArIEZSQU1FX1RPT0xCQVJfSEVJR0hUIChmKSkgLyBzY2Fs ZTsKKyAgICAgIGludCB3aWR0aF9pbmMgPSBGUkFNRV9DT0xVTU5fV0lEVEggKGYpIC8gc2Nh bGU7CisgICAgICBpbnQgaGVpZ2h0X2luYyA9IEZSQU1FX0xJTkVfSEVJR0hUIChmKSAvIHNj YWxlOworCisgICAgICBpZiAod2lkdGhfaW5jIDwgMSkKKwl3aWR0aF9pbmMgPSAxOworCisg ICAgICBpZiAoaGVpZ2h0X2luYyA8IDEpCisJaGVpZ2h0X2luYyA9IDE7CisKKyAgICAgIGlm IChvdXRlcl93aWR0aCA8IGJhc2Vfd2lkdGgpCisJb3V0ZXJfd2lkdGggPSBiYXNlX3dpZHRo OworCisgICAgICBpZiAob3V0ZXJfaGVpZ2h0IDwgYmFzZV9oZWlnaHQpCisJb3V0ZXJfaGVp Z2h0ID0gYmFzZV9oZWlnaHQ7CisKKyAgICAgIG91dGVyX3dpZHRoCisJPSBvdXRlcl93aWR0 aCAtICgob3V0ZXJfd2lkdGggLSBiYXNlX3dpZHRoKSAlIHdpZHRoX2luYyk7CisgICAgICBv dXRlcl9oZWlnaHQKKwk9IG91dGVyX2hlaWdodCAtICgob3V0ZXJfaGVpZ2h0IC0gYmFzZV9o ZWlnaHQpICUgaGVpZ2h0X2luYyk7CisgICAgfQogCiAgIHhnX3dtX3NldF9zaXplX2hpbnQg KGYsIDAsIDApOwogCkBAIC0xMzE3LDYgKzEzNTUsMzAgQEAgeGdfZnJhbWVfc2V0X2NoYXJf c2l6ZSAoc3RydWN0IGZyYW1lICpmLCBpbnQgd2lkdGgsIGludCBoZWlnaHQpCiAgIFNFVF9G UkFNRV9HQVJCQUdFRCAoZik7CiAgIGNhbmNlbF9tb3VzZV9mYWNlIChmKTsKIAorICBzaXpl X2hpbnRzID0gZi0+b3V0cHV0X2RhdGEueHAtPnNpemVfaGludHM7CisgIGlmIChvdXRlcl93 aWR0aCA+IDAgJiYgc2l6ZV9oaW50cy5iYXNlX3dpZHRoID4gMCAmJiBzaXplX2hpbnRzLndp ZHRoX2luYyA+IDAKKyAgICAgICYmIG91dGVyX2hlaWdodCA+IDAgJiYgc2l6ZV9oaW50cy5i YXNlX2hlaWdodCA+IDAgJiYgc2l6ZV9oaW50cy5oZWlnaHRfaW5jID4gMCkKKyAgICBDQUxM TiAoRmZ1bmNhbGwsIFFmb29faXQsIGludGVybiAoInhnX2ZyYW1lX3NldF9jaGFyX3NpemUi KSwKKwkgICBpbnRlcm4gKCJvbGQgbmF0aXZlIHBpeGVscyIpLAorCSAgIEZjb25zIChtYWtl X2ZpeG51bSAoRlJBTUVfUElYRUxfV0lEVEggKGYpKSwKKwkJICBtYWtlX2ZpeG51bSAoRlJB TUVfUElYRUxfSEVJR0hUIChmKSkpLAorCSAgIGludGVybiAoIm5ldyBuYXRpdmUgcGl4ZWxz IiksCisJICAgRmNvbnMgKG1ha2VfZml4bnVtICh3aWR0aCksIG1ha2VfZml4bnVtIChoZWln aHQpKSwKKwkgICBpbnRlcm4gKCJvdXRlciBwaXhlbHMiKSwKKwkgICBGY29ucyAobWFrZV9m aXhudW0gKG91dGVyX3dpZHRoKSwgbWFrZV9maXhudW0gKG91dGVyX2hlaWdodCkpLAorCSAg IGludGVybiAoIm91dGVyIHJlc3QiKSwKKwkgICBGY29ucyAobWFrZV9maXhudW0gKChvdXRl cl93aWR0aCAtIHNpemVfaGludHMuYmFzZV93aWR0aCkgJSBzaXplX2hpbnRzLndpZHRoX2lu YyksCisJCSAgbWFrZV9maXhudW0gKChvdXRlcl9oZWlnaHQgLSBzaXplX2hpbnRzLmJhc2Vf aGVpZ2h0KSAlIHNpemVfaGludHMuaGVpZ2h0X2luYykpKTsKKyAgZWxzZQorICAgIENBTExO IChGZnVuY2FsbCwgUWZvb19pdCwgaW50ZXJuICgieGdfZnJhbWVfc2V0X2NoYXJfc2l6ZSIp LAorCSAgIGludGVybiAoIm9sZCBuYXRpdmUgcGl4ZWxzIiksCisJICAgRmNvbnMgKG1ha2Vf Zml4bnVtIChGUkFNRV9QSVhFTF9XSURUSCAoZikpLAorCQkgIG1ha2VfZml4bnVtIChGUkFN RV9QSVhFTF9IRUlHSFQgKGYpKSksCisJICAgaW50ZXJuICgibmV3IG5hdGl2ZSBwaXhlbHMi KSwKKwkgICBGY29ucyAobWFrZV9maXhudW0gKHdpZHRoKSwgbWFrZV9maXhudW0gKGhlaWdo dCkpLAorCSAgIGludGVybiAoIm91dGVyIHBpeGVscyIpLAorCSAgIEZjb25zIChtYWtlX2Zp eG51bSAob3V0ZXJfd2lkdGgpLCBtYWtlX2ZpeG51bSAob3V0ZXJfaGVpZ2h0KSkpOworCiAg IC8qIFdlIGNhbiBub3QgY2FsbCBjaGFuZ2VfZnJhbWVfc2l6ZSBmb3IgYSBtYXBwZWQgZnJh bWUsCiAgICAgIHdlIGNhbiBub3Qgc2V0IHBpeGVsIHdpZHRoL2hlaWdodCBlaXRoZXIuICBU aGUgd2luZG93IG1hbmFnZXIgbWF5CiAgICAgIG92ZXJyaWRlIG91ciByZXNpemUgcmVxdWVz dCwgWE1vbmFkIGRvZXMgdGhpcyBhbGwgdGhlIHRpbWUuCkBAIC0yMDI4LDYgKzIwOTAsMjQg QEAgeGdfd21fc2V0X3NpemVfaGludCAoc3RydWN0IGZyYW1lICpmLCBsb25nIGludCBmbGFn cywgYm9vbCB1c2VyX3Bvc2l0aW9uKQogCQkgJmYtPm91dHB1dF9kYXRhLnhwLT5zaXplX2hp bnRzLAogCQkgc2l6ZW9mIChzaXplX2hpbnRzKSkgIT0gMCkKICAgICB7CisgICAgICBDQUxM TiAoRmZ1bmNhbGwsIFFmb29faXQsIGludGVybiAoInhnX3dtX3NldF9zaXplX2hpbnQiKSwK KwkgICAgIGludGVybiAoInNjYWxlIiksIG1ha2VfZml4bnVtIChzY2FsZSksCisJICAgICBp bnRlcm4gKCJjaGFyIHdpZHRoIiksIG1ha2VfZml4bnVtIChGUkFNRV9DT0xVTU5fV0lEVEgg KGYpKSwKKwkgICAgIGludGVybiAoInRvb2xiYXIiKSwgbWFrZV9maXhudW0gKEZSQU1FX1RP T0xCQVJfV0lEVEggKGYpKSwKKwkgICAgIGludGVybiAoInZzY3JvbGwiKSwgbWFrZV9maXhu dW0gKEZSQU1FX1NDUk9MTF9CQVJfQVJFQV9XSURUSCAoZikpLAorCSAgICAgaW50ZXJuICgi ZnJpbmdlcyIpLCBtYWtlX2ZpeG51bSAoRlJBTUVfVE9UQUxfRlJJTkdFX1dJRFRIIChmKSks CisJICAgICBpbnRlcm4gKCJib3JkZXJzIiksIG1ha2VfZml4bnVtICgyICogRlJBTUVfSU5U RVJOQUxfQk9SREVSX1dJRFRIIChmKSksCisJICAgICBpbnRlcm4gKCJiYXNlIHdpZHRoIiks IG1ha2VfZml4bnVtIChzaXplX2hpbnRzLmJhc2Vfd2lkdGgpLAorCSAgICAgaW50ZXJuICgi d2lkdGggaW5jIiksIG1ha2VfZml4bnVtIChzaXplX2hpbnRzLndpZHRoX2luYykpOworICAg ICAgQ0FMTE4gKEZmdW5jYWxsLCBRZm9vX2l0LCBpbnRlcm4gKCIgICAiKSwKKwkgICAgIGlu dGVybiAoImNoYXIgaGVpZ2h0IiksIG1ha2VfZml4bnVtIChGUkFNRV9MSU5FX0hFSUdIVCAo ZikpLAorCSAgICAgaW50ZXJuICgibWVudWJhciIpLCBtYWtlX2ZpeG51bSAoRlJBTUVfTUVO VUJBUl9IRUlHSFQgKGYpKSwKKwkgICAgIGludGVybiAoInRvb2xiYXIiKSwgbWFrZV9maXhu dW0gKEZSQU1FX1RPT0xCQVJfSEVJR0hUIChmKSksCisJICAgICBpbnRlcm4gKCJoc2Nyb2xs IiksIG1ha2VfZml4bnVtIChGUkFNRV9TQ1JPTExfQkFSX0FSRUFfSEVJR0hUIChmKSksCisJ ICAgICBpbnRlcm4gKCJib3JkZXJzIiksIG1ha2VfZml4bnVtICgyICogRlJBTUVfSU5URVJO QUxfQk9SREVSX1dJRFRIIChmKSksCisJICAgICBpbnRlcm4gKCJiYXNlIGhlaWdodCIpLCBt YWtlX2ZpeG51bSAoc2l6ZV9oaW50cy5iYXNlX2hlaWdodCksCisJICAgICBpbnRlcm4gKCJo ZWlnaHQgaW5jIiksIG1ha2VfZml4bnVtIChzaXplX2hpbnRzLmhlaWdodF9pbmMpKTsKKwog ICAgICAgYmxvY2tfaW5wdXQgKCk7CiAgICAgICBndGtfd2luZG93X3NldF9nZW9tZXRyeV9o aW50cyAoR1RLX1dJTkRPVyAoRlJBTUVfR1RLX09VVEVSX1dJREdFVCAoZikpLAogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIE5VTEwsICZzaXplX2hpbnRzLCBoaW50 X2ZsYWdzKTsKZGlmZiAtLWdpdCBhL3NyYy93aW5kb3cuYyBiL3NyYy93aW5kb3cuYwppbmRl eCBmMTE2YjlhOWQ3Li5jMDkwZjI5NDYxIDEwMDY0NAotLS0gYS9zcmMvd2luZG93LmMKKysr IGIvc3JjL3dpbmRvdy5jCkBAIC04Mzk0LDYgKzgzOTQsNyBAQCBzeW1zX29mX3dpbmRvdyAo dm9pZCkKICAgREVGU1lNIChRaGVhZGVyX2xpbmVfZm9ybWF0LCAiaGVhZGVyLWxpbmUtZm9y bWF0Iik7CiAgIERFRlNZTSAoUXRhYl9saW5lX2Zvcm1hdCwgInRhYi1saW5lLWZvcm1hdCIp OwogICBERUZTWU0gKFFub19vdGhlcl93aW5kb3csICJuby1vdGhlci13aW5kb3ciKTsKKyAg REVGU1lNIChRZm9vX2l0LCAiZm9vLWl0Iik7CiAKICAgREVGVkFSX0xJU1AgKCJ0ZW1wLWJ1 ZmZlci1zaG93LWZ1bmN0aW9uIiwgVnRlbXBfYnVmZmVyX3Nob3dfZnVuY3Rpb24sCiAJICAg ICAgIGRvYzogLyogTm9uLW5pbCBtZWFucyBjYWxsIGFzIGZ1bmN0aW9uIHRvIGRpc3BsYXkg YSBoZWxwIGJ1ZmZlci4KZGlmZiAtLWdpdCBhL3NyYy94dGVybS5jIGIvc3JjL3h0ZXJtLmMK aW5kZXggN2VhZjU5ZDU0Yi4uYjJlNjg5ZmU4NCAxMDA2NDQKLS0tIGEvc3JjL3h0ZXJtLmMK KysrIGIvc3JjL3h0ZXJtLmMKQEAgLTI2MTYwLDYgKzI2MTYwLDggQEAgeF9uZXdfZm9udCAo c3RydWN0IGZyYW1lICpmLCBMaXNwX09iamVjdCBmb250X29iamVjdCwgaW50IGZvbnRzZXQp CiB7CiAgIHN0cnVjdCBmb250ICpmb250ID0gWEZPTlRfT0JKRUNUIChmb250X29iamVjdCk7 CiAgIGludCB1bml0LCBmb250X2FzY2VudCwgZm9udF9kZXNjZW50OworICBpbnQgb2xkX3dp ZHRoID0gRlJBTUVfQ09MVU1OX1dJRFRIIChmKTsKKyAgaW50IG9sZF9oZWlnaHQgPSBGUkFN RV9MSU5FX0hFSUdIVCAoZik7CiAKICAgaWYgKGZvbnRzZXQgPCAwKQogICAgIGZvbnRzZXQg PSBmb250c2V0X2Zyb21fZm9udCAoZm9udF9vYmplY3QpOwpAQCAtMjYxOTcsOSArMjYxOTks MjcgQEAgeF9uZXdfZm9udCAoc3RydWN0IGZyYW1lICpmLCBMaXNwX09iamVjdCBmb250X29i amVjdCwgaW50IGZvbnRzZXQpCiAgICAgIGJlY2F1c2UgaXQncyBkb25lIGluIEZ4X3Nob3df dGlwLCBhbmQgaXQgbGVhZHMgdG8gcHJvYmxlbXMgYmVjYXVzZQogICAgICB0aGUgdGlwIGZy YW1lIGhhcyBubyB3aWRnZXQuICAqLwogICBpZiAoRlJBTUVfWF9XSU5ET1cgKGYpICE9IDAg JiYgIUZSQU1FX1RPT0xUSVBfUCAoZikpCi0gICAgYWRqdXN0X2ZyYW1lX3NpemUKLSAgICAg IChmLCBGUkFNRV9DT0xTIChmKSAqIEZSQU1FX0NPTFVNTl9XSURUSCAoZiksCi0gICAgICAg RlJBTUVfTElORVMgKGYpICogRlJBTUVfTElORV9IRUlHSFQgKGYpLCAzLCBmYWxzZSwgUWZv bnQpOworICAgIHsKKyAgICAgIENBTExOIChGZnVuY2FsbCwgUWZvb19pdCwgaW50ZXJuICgi XG54X25ld19mb250IiksCisJICAgICBpbnRlcm4gKCJvbGQgY2hhciBzaXplIiksCisJICAg ICBGY29ucyAobWFrZV9maXhudW0gKG9sZF93aWR0aCksIG1ha2VfZml4bnVtIChvbGRfaGVp Z2h0KSksCisJICAgICBpbnRlcm4gKCJuZXcgY2hhciBzaXplIiksCisJICAgICBGY29ucyAo bWFrZV9maXhudW0gKEZSQU1FX0NPTFVNTl9XSURUSCAoZikpLAorCQkgICAgbWFrZV9maXhu dW0gKEZSQU1FX0xJTkVfSEVJR0hUIChmKSkpLAorCSAgICAgaW50ZXJuICgidGV4dCBjaGFy cyIpLAorCSAgICAgRmNvbnMgKG1ha2VfZml4bnVtIChGUkFNRV9DT0xTIChmKSksCisJCSAg ICBtYWtlX2ZpeG51bSAoRlJBTUVfTElORVMgKGYpKSksCisJICAgICBpbnRlcm4gKCJvbGQg dGV4dCBwaXhlbHMiKSwKKwkgICAgIEZjb25zIChtYWtlX2ZpeG51bSAoRlJBTUVfVEVYVF9X SURUSCAoZikpLAorCQkgICAgbWFrZV9maXhudW0gKEZSQU1FX1RFWFRfSEVJR0hUIChmKSkp LAorCSAgICAgaW50ZXJuICgibmV3IHRleHQgcGl4ZWxzIiksCisJICAgICBGY29ucyAobWFr ZV9maXhudW0gKEZSQU1FX0NPTFMgKGYpICogRlJBTUVfQ09MVU1OX1dJRFRIIChmKSksCisJ CSAgICBtYWtlX2ZpeG51bSAoRlJBTUVfTElORVMgKGYpICogRlJBTUVfTElORV9IRUlHSFQg KGYpKSkpOworCisgICAgICBhZGp1c3RfZnJhbWVfc2l6ZQorCShmLCBGUkFNRV9DT0xTIChm KSAqIEZSQU1FX0NPTFVNTl9XSURUSCAoZiksCisJIEZSQU1FX0xJTkVTIChmKSAqIEZSQU1F X0xJTkVfSEVJR0hUIChmKSwgMywgZmFsc2UsIFFmb250KTsKKyAgICB9CiAKICNpZmRlZiBI QVZFX1hfSTE4TgogICBpZiAoRlJBTUVfWElDIChmKQo= --------------rO9cWTNa1tmc9F7lFWgRFRaP--