From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Aaron Jensen Newsgroups: gmane.emacs.bugs Subject: bug#30553: 26.0.91; underline appears beneath line-spacing rather than beneath text Date: Wed, 28 Feb 2018 07:19:02 -0800 Message-ID: References: <83r2pf78x5.fsf@gnu.org> <83fu5v6kdi.fsf@gnu.org> <83371u6xc2.fsf@gnu.org> <83y3jf21wh.fsf@gnu.org> <83inaj1rk6.fsf@gnu.org> <83efl71o1u.fsf@gnu.org> <83a7vu1k51.fsf@gnu.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="089e082cd9f46cbfec0566474304" X-Trace: blaine.gmane.org 1519831098 10609 195.159.176.226 (28 Feb 2018 15:18:18 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Wed, 28 Feb 2018 15:18:18 +0000 (UTC) Cc: Alp Aker , 30553@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Feb 28 16:18:14 2018 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1er3Ui-0001ht-7b for geb-bug-gnu-emacs@m.gmane.org; Wed, 28 Feb 2018 16:18:12 +0100 Original-Received: from localhost ([::1]:45087 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1er3Wf-00027t-Iv for geb-bug-gnu-emacs@m.gmane.org; Wed, 28 Feb 2018 10:20:13 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:50276) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1er3WY-00027Y-4a for bug-gnu-emacs@gnu.org; Wed, 28 Feb 2018 10:20:07 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1er3WU-0007fb-Ui for bug-gnu-emacs@gnu.org; Wed, 28 Feb 2018 10:20:06 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:57983) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1er3WU-0007fH-OM for bug-gnu-emacs@gnu.org; Wed, 28 Feb 2018 10:20:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1er3WU-0000gs-Ci for bug-gnu-emacs@gnu.org; Wed, 28 Feb 2018 10:20:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Aaron Jensen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 28 Feb 2018 15:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 30553 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 30553-submit@debbugs.gnu.org id=B30553.15198311502583 (code B ref 30553); Wed, 28 Feb 2018 15:20:02 +0000 Original-Received: (at 30553) by debbugs.gnu.org; 28 Feb 2018 15:19:10 +0000 Original-Received: from localhost ([127.0.0.1]:37647 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1er3Ve-0000fb-By for submit@debbugs.gnu.org; Wed, 28 Feb 2018 10:19:10 -0500 Original-Received: from mail-qk0-f172.google.com ([209.85.220.172]:39654) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1er3Vd-0000fO-9M for 30553@debbugs.gnu.org; Wed, 28 Feb 2018 10:19:09 -0500 Original-Received: by mail-qk0-f172.google.com with SMTP id z197so3392916qkb.6 for <30553@debbugs.gnu.org>; Wed, 28 Feb 2018 07:19:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=TVLQddAnzee2+E6BNEcfJTFKVfywI226rwacqmJG84Y=; b=X/njmySbn5T3ammN0VYAmiKKmt8wcMcQYWxHgavccnoI26F/hVPLGcktfN66d2+TqY 2D7r0RwTPhr+eVhLjto2l2zWeKAoWkx2/RY1tFKjYT0dBQTaRv1u+PY3cT6nAn9nmPGt vrRwEqqHtxZnPqOgTSLSi+KD3iqZXI81QSCfuy9VelV82gkzguOxqbLig+5WC4BJQUiJ ACShmThkH7qUyKaeb8p7RK6Fjb966foHDSbFbCXiEHB9u7OHxVc/FCE8wFlHBHl0PuFm /DlyQLi0o6iZSo9thqNOKtAN5aOXZebFbKuPxB8xeYtBipA7+eoAtVmJ15cJztE75TRJ Efng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=TVLQddAnzee2+E6BNEcfJTFKVfywI226rwacqmJG84Y=; b=EiRj8MReAHrSx+i1e+pHiXvinnBR+e0CDH6yHQqsxF1Qt+NYYOoDsSAjm+JG9kHwtR BdIljqlFU39VMRMs2YepXGhZech9pmiuK/QY2eCsJ65nJmkKidqcLEZ3ZYcmeiWjNQeK 0Lb1765ybRfm1uSesJfF0lfVHV6OIj7qCPM5JeB6k+Bu5svMGARwJkb9FhtGd/vP/kFR sj8+iE5g23Crk4n0281/NDa9GLmG6Oio5OEcR5hrmRyIPixJkH+6EOK7Gw5/pLE8CyWn Lhw+wPZwKxwCaFlsz5wsQ/+5aBfyazNqBDU8V07su1slad640TrHwnktQmyrCHmXHn5T IGJA== X-Gm-Message-State: APf1xPC91Obcgh0tN0NGNiSNcag1WEYcKhHK/4nLYjaaYvt7yjF5Fo1w rb1R7d6KYhgGl80XGmeHarpi6CnzCZTePx5OiJs= X-Google-Smtp-Source: AG47ELtsB5JCROlZnaWhnWCpE3U8N4w3zIcWBcIwYTunX/tzIa1cZIkm8zUvNDGVC0Yd4cdmgTD9eehSPPq/3CmK4Xk= X-Received: by 10.55.249.4 with SMTP id l4mr27239804qkj.165.1519831143456; Wed, 28 Feb 2018 07:19:03 -0800 (PST) Original-Received: by 10.237.54.65 with HTTP; Wed, 28 Feb 2018 07:19:02 -0800 (PST) In-Reply-To: <83a7vu1k51.fsf@gnu.org> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 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.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:143736 Archived-At: --089e082cd9f46cbfec0566474304 Content-Type: text/plain; charset="UTF-8" On Tue, Feb 27, 2018 at 8:18 AM, Eli Zaretskii wrote: > and similarly with other variables (except that a boolean variable > will return a value of Qt or Qnil, not a number). Thank you for the feedback. I used NILP and Fbuffer_local_value because I saw that used elsewhere. If that's not right, please let me know. > I think this symbol should be in xdisp.c, where the variable is > defined. Done. Patch attached, thanks! --089e082cd9f46cbfec0566474304 Content-Type: application/octet-stream; name="0001-Allow-buffer-local-underline-position-vars.patch" Content-Disposition: attachment; filename="0001-Allow-buffer-local-underline-position-vars.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_je787rbf0 RnJvbSBiOTczNzlkZWZiMmUzZTYyNzgzMDI5ZDEyMzZjNzI0ZGFkMGVmYzIzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBYXJvbiBKZW5zZW4gPGFhcm9uamVuc2VuQGdtYWlsLmNvbT4K RGF0ZTogV2VkLCAyOCBGZWIgMjAxOCAwNzoxNzoxNCAtMDgwMApTdWJqZWN0OiBbUEFUQ0hdIEFs bG93IGJ1ZmZlciBsb2NhbCB1bmRlcmxpbmUgcG9zaXRpb24gdmFycwoKKiBzcmMvbnN0ZXJtLm0g KG5zX2RyYXdfdGV4dF9kZWNvcmF0aW9uKToKKiBzcmMvdzMydGVybS5jICh4X2RyYXdfZ2x5cGhf c3RyaW5nKToKKiBzcmMveHRlcm0uYyAoeF9kcmF3X2dseXBoX3N0cmluZyk6IEFsbG93IGJ1ZmZl ciBsb2NhbCB1bmRlcmxpbmUKcG9zaXRpb24gdmFycwoKKiBzcmMveGRpc3AuYzogQWRkIHN5bWJv bAotLS0KIHNyYy9uc3Rlcm0ubSAgfCAxOSArKysrKysrKysrKysrKystLS0tCiBzcmMvdzMydGVy bS5jIHwgMTggKysrKysrKysrKysrKysrLS0tCiBzcmMveGRpc3AuYyAgIHwgIDEgKwogc3JjL3h0 ZXJtLmMgICB8IDE5ICsrKysrKysrKysrKysrKy0tLS0KIDQgZmlsZXMgY2hhbmdlZCwgNDYgaW5z ZXJ0aW9ucygrKSwgMTEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvc3JjL25zdGVybS5tIGIv c3JjL25zdGVybS5tCmluZGV4IDE5MTljNmRlZmEuLmEwMDRlNzNjNGIgMTAwNjQ0Ci0tLSBhL3Ny Yy9uc3Rlcm0ubQorKysgYi9zcmMvbnN0ZXJtLm0KQEAgLTM0ODcsMjMgKzM0ODcsMzIgQEAgTm90 ZSB0aGF0IENVUlNPUl9XSURUSCBpcyBtZWFuaW5nZnVsIG9ubHkgZm9yIChoKWJhciBjdXJzb3Jz LgogICAgICAgICAgICAgewogCSAgICAgIHN0cnVjdCBmb250ICpmb250ID0gZm9udF9mb3JfdW5k ZXJsaW5lX21ldHJpY3MgKHMpOwogICAgICAgICAgICAgICB1bnNpZ25lZCBsb25nIGRlc2NlbnQg PSBzLT55ICsgcy0+aGVpZ2h0IC0gcy0+eWJhc2U7CisgICAgICAgICAgICAgIHVuc2lnbmVkIGxv bmcgbWluaW11bV9vZmZzZXQ7CisgICAgICAgICAgICAgIExpc3BfT2JqZWN0IHZhbCA9IEZidWZm ZXJfbG9jYWxfdmFsdWUgKFF1bmRlcmxpbmVfbWluaW11bV9vZmZzZXQsCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcy0+dy0+Y29udGVudHMpOwor ICAgICAgICAgICAgICBpZiAoSU5URUdFUlAgKHZhbCkpCisgICAgICAgICAgICAgICAgbWluaW11 bV9vZmZzZXQgPSBYRkFTVElOVCAodmFsKTsKKyAgICAgICAgICAgICAgZWxzZQorICAgICAgICAg ICAgICAgIG1pbmltdW1fb2Zmc2V0ID0gMTsKIAogICAgICAgICAgICAgICAvKiBVc2UgdW5kZXJs aW5lIHRoaWNrbmVzcyBvZiBmb250LCBkZWZhdWx0aW5nIHRvIDEuICovCiAgICAgICAgICAgICAg IHRoaWNrbmVzcyA9IChmb250ICYmIGZvbnQtPnVuZGVybGluZV90aGlja25lc3MgPiAwKQogICAg ICAgICAgICAgICAgID8gZm9udC0+dW5kZXJsaW5lX3RoaWNrbmVzcyA6IDE7CiAKICAgICAgICAg ICAgICAgLyogRGV0ZXJtaW5lIHRoZSBvZmZzZXQgb2YgdW5kZXJsaW5pbmcgZnJvbSB0aGUgYmFz ZWxpbmUuICovCi0gICAgICAgICAgICAgIGlmICh4X3VuZGVybGluZV9hdF9kZXNjZW50X2xpbmUp CisgICAgICAgICAgICAgIGlmICghTklMUCAoRmJ1ZmZlcl9sb2NhbF92YWx1ZSAoUXhfdW5kZXJs aW5lX2F0X2Rlc2NlbnRfbGluZSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBzLT53LT5jb250ZW50cykpKQogICAgICAgICAgICAgICAgIHBvc2l0aW9uID0g ZGVzY2VudCAtIHRoaWNrbmVzczsKLSAgICAgICAgICAgICAgZWxzZSBpZiAoeF91c2VfdW5kZXJs aW5lX3Bvc2l0aW9uX3Byb3BlcnRpZXMKKyAgICAgICAgICAgICAgZWxzZSBpZiAoIU5JTFAgKEZi dWZmZXJfbG9jYWxfdmFsdWUgKFF4X3VzZV91bmRlcmxpbmVfcG9zaXRpb25fcHJvcGVydGllcywK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHMtPnct PmNvbnRlbnRzKSkKICAgICAgICAgICAgICAgICAgICAgICAgJiYgZm9udCAmJiBmb250LT51bmRl cmxpbmVfcG9zaXRpb24gPj0gMCkKICAgICAgICAgICAgICAgICBwb3NpdGlvbiA9IGZvbnQtPnVu ZGVybGluZV9wb3NpdGlvbjsKICAgICAgICAgICAgICAgZWxzZSBpZiAoZm9udCkKICAgICAgICAg ICAgICAgICBwb3NpdGlvbiA9IGxyb3VuZCAoZm9udC0+ZGVzY2VudCAvIDIpOwogICAgICAgICAg ICAgICBlbHNlCi0gICAgICAgICAgICAgICAgcG9zaXRpb24gPSB1bmRlcmxpbmVfbWluaW11bV9v ZmZzZXQ7CisgICAgICAgICAgICAgICAgcG9zaXRpb24gPSBtaW5pbXVtX29mZnNldDsKIAotICAg ICAgICAgICAgICBwb3NpdGlvbiA9IG1heCAocG9zaXRpb24sIHVuZGVybGluZV9taW5pbXVtX29m ZnNldCk7CisgICAgICAgICAgICAgIHBvc2l0aW9uID0gbWF4IChwb3NpdGlvbiwgbWluaW11bV9v ZmZzZXQpOwogCiAgICAgICAgICAgICAgIC8qIEVuc3VyZSB1bmRlcmxpbmluZyBpcyBub3QgY3Jv cHBlZC4gKi8KICAgICAgICAgICAgICAgaWYgKGRlc2NlbnQgPD0gcG9zaXRpb24pCkBAIC05NDY1 LDExICs5NDc0LDEzIEBAIE5pbCBtZWFucyB1c2UgZnVsbHNjcmVlbiB0aGUgb2xkICg8IDEwLjcp IHdheS4gIFRoZSBvbGQgd2F5IHdvcmtzIGJldHRlciB3aXRoCiAJICAgICAgIHhfdXNlX3VuZGVy bGluZV9wb3NpdGlvbl9wcm9wZXJ0aWVzLAogICAgICBkb2M6IC8qIFNLSVA6IHJlYWwgZG9jIGlu IHh0ZXJtLmMuICAqLyk7CiAgIHhfdXNlX3VuZGVybGluZV9wb3NpdGlvbl9wcm9wZXJ0aWVzID0g MDsKKyAgREVGU1lNIChReF91c2VfdW5kZXJsaW5lX3Bvc2l0aW9uX3Byb3BlcnRpZXMsICJ4LXVz ZS11bmRlcmxpbmUtcG9zaXRpb24tcHJvcGVydGllcyIpOwogCiAgIERFRlZBUl9CT09MICgieC11 bmRlcmxpbmUtYXQtZGVzY2VudC1saW5lIiwKIAkgICAgICAgeF91bmRlcmxpbmVfYXRfZGVzY2Vu dF9saW5lLAogICAgICBkb2M6IC8qIFNLSVA6IHJlYWwgZG9jIGluIHh0ZXJtLmMuICAqLyk7CiAg IHhfdW5kZXJsaW5lX2F0X2Rlc2NlbnRfbGluZSA9IDA7CisgIERFRlNZTSAoUXhfdW5kZXJsaW5l X2F0X2Rlc2NlbnRfbGluZSwgIngtdW5kZXJsaW5lLWF0LWRlc2NlbnQtbGluZSIpOwogCiAgIC8q IFRlbGwgRW1hY3MgYWJvdXQgdGhpcyB3aW5kb3cgc3lzdGVtLiAgKi8KICAgRnByb3ZpZGUgKFFu cywgUW5pbCk7CmRpZmYgLS1naXQgYS9zcmMvdzMydGVybS5jIGIvc3JjL3czMnRlcm0uYwppbmRl eCA5N2FmYjY3OGMxLi5jM2ZjZTA0ODFjIDEwMDY0NAotLS0gYS9zcmMvdzMydGVybS5jCisrKyBi L3NyYy93MzJ0ZXJtLmMKQEAgLTI0NzUsMTMgKzI0NzUsMjIgQEAgeF9kcmF3X2dseXBoX3N0cmlu ZyAoc3RydWN0IGdseXBoX3N0cmluZyAqcykKICAgICAgICAgICAgICAgZWxzZQogICAgICAgICAg ICAgICAgIHsKIAkJICBzdHJ1Y3QgZm9udCAqZm9udCA9IGZvbnRfZm9yX3VuZGVybGluZV9tZXRy aWNzIChzKTsKKyAgICAgICAgICAgICAgICAgIHVuc2lnbmVkIGxvbmcgbWluaW11bV9vZmZzZXQ7 CisgICAgICAgICAgICAgICAgICBMaXNwX09iamVjdCB2YWwgPSBidWZmZXJfbG9jYWxfdmFsdWUg KFF1bmRlcmxpbmVfbWluaW11bV9vZmZzZXQsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHMtPnctPmNvbnRlbnRzKTsKKyAgICAgICAgICAg ICAgICAgIGlmIChJTlRFR0VSUCAodmFsKSkKKyAgICAgICAgICAgICAgICAgICAgbWluaW11bV9v ZmZzZXQgPSBYRkFTVElOVCAodmFsKTsKKyAgICAgICAgICAgICAgICAgIGVsc2UKKyAgICAgICAg ICAgICAgICAgICAgbWluaW11bV9vZmZzZXQgPSAxOwogCiAgICAgICAgICAgICAgICAgICAvKiBH ZXQgdGhlIHVuZGVybGluZSB0aGlja25lc3MuICBEZWZhdWx0IGlzIDEgcGl4ZWwuICAqLwogICAg ICAgICAgICAgICAgICAgaWYgKGZvbnQgJiYgZm9udC0+dW5kZXJsaW5lX3RoaWNrbmVzcyA+IDAp CiAgICAgICAgICAgICAgICAgICAgIHRoaWNrbmVzcyA9IGZvbnQtPnVuZGVybGluZV90aGlja25l c3M7CiAgICAgICAgICAgICAgICAgICBlbHNlCiAgICAgICAgICAgICAgICAgICAgIHRoaWNrbmVz cyA9IDE7Ci0gICAgICAgICAgICAgICAgICBpZiAoeF91bmRlcmxpbmVfYXRfZGVzY2VudF9saW5l IHx8ICFmb250KQorICAgICAgICAgICAgICAgICAgaWYgKCFOSUxQIChGYnVmZmVyX2xvY2FsX3Zh bHVlIChReF91bmRlcmxpbmVfYXRfZGVzY2VudF9saW5lLAorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzLT53LT5jb250ZW50cykpCisgICAgICAgICAg ICAgICAgICAgICAgfHwgIWZvbnQpCiAgICAgICAgICAgICAgICAgICAgIHBvc2l0aW9uID0gKHMt PmhlaWdodCAtIHRoaWNrbmVzcykgLSAocy0+eWJhc2UgLSBzLT55KTsKICAgICAgICAgICAgICAg ICAgIGVsc2UKICAgICAgICAgICAgICAgICAgICAgewpAQCAtMjQ5MywxMyArMjUwMiwxNCBAQCB4 X2RyYXdfZ2x5cGhfc3RyaW5nIChzdHJ1Y3QgZ2x5cGhfc3RyaW5nICpzKQogICAgICAgICAgICAg ICAgICAgICAgICAgIFJPVU5EICgobWF4aW11bV9kZXNjZW50KSAvIDIpLCB3aXRoCiAgICAgICAg ICAgICAgICAgICAgICAgICAgUk9VTkQgKHgpID0gZmxvb3IgKHggKyAwLjUpICAqLwogCi0gICAg ICAgICAgICAgICAgICAgICAgaWYgKHhfdXNlX3VuZGVybGluZV9wb3NpdGlvbl9wcm9wZXJ0aWVz CisgICAgICAgICAgICAgICAgICAgICAgaWYgKCFOSUxQIChGYnVmZmVyX2xvY2FsX3ZhbHVlIChR eF91c2VfdW5kZXJsaW5lX3Bvc2l0aW9uX3Byb3BlcnRpZXMsCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzLT53LT5jb250ZW50cykpCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICYmIGZvbnQtPnVuZGVybGluZV9wb3NpdGlvbiA+PSAwKQog ICAgICAgICAgICAgICAgICAgICAgICAgcG9zaXRpb24gPSBmb250LT51bmRlcmxpbmVfcG9zaXRp b247CiAgICAgICAgICAgICAgICAgICAgICAgZWxzZQogICAgICAgICAgICAgICAgICAgICAgICAg cG9zaXRpb24gPSAoZm9udC0+ZGVzY2VudCArIDEpIC8gMjsKICAgICAgICAgICAgICAgICAgICAg fQotICAgICAgICAgICAgICAgICAgcG9zaXRpb24gPSBtYXggKHBvc2l0aW9uLCB1bmRlcmxpbmVf bWluaW11bV9vZmZzZXQpOworICAgICAgICAgICAgICAgICAgcG9zaXRpb24gPSBtYXggKHBvc2l0 aW9uLCBtaW5pbXVtX29mZnNldCk7CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAv KiBDaGVjayB0aGUgc2FuaXR5IG9mIHRoaWNrbmVzcyBhbmQgcG9zaXRpb24uICBXZSBzaG91bGQK ICAgICAgICAgICAgICAgICAgYXZvaWQgZHJhd2luZyB1bmRlcmxpbmUgb3V0IG9mIHRoZSBjdXJy ZW50IGxpbmUgYXJlYS4gICovCkBAIC03Mzg1LDExICs3Mzk1LDEzIEBAIHRoZSBjdXJzb3IgaGF2 ZSBubyBlZmZlY3QuICAqLyk7CiAJICAgICAgIHhfdXNlX3VuZGVybGluZV9wb3NpdGlvbl9wcm9w ZXJ0aWVzLAogICAgICBkb2M6IC8qIFNLSVA6IHJlYWwgZG9jIGluIHh0ZXJtLmMuICAqLyk7CiAg IHhfdXNlX3VuZGVybGluZV9wb3NpdGlvbl9wcm9wZXJ0aWVzID0gMDsKKyAgREVGU1lNIChReF91 c2VfdW5kZXJsaW5lX3Bvc2l0aW9uX3Byb3BlcnRpZXMsICJ4LXVzZS11bmRlcmxpbmUtcG9zaXRp b24tcHJvcGVydGllcyIpOwogCiAgIERFRlZBUl9CT09MICgieC11bmRlcmxpbmUtYXQtZGVzY2Vu dC1saW5lIiwKIAkgICAgICAgeF91bmRlcmxpbmVfYXRfZGVzY2VudF9saW5lLAogICAgICBkb2M6 IC8qIFNLSVA6IHJlYWwgZG9jIGluIHh0ZXJtLmMuICAqLyk7CiAgIHhfdW5kZXJsaW5lX2F0X2Rl c2NlbnRfbGluZSA9IDA7CisgIERFRlNZTSAoUXhfdW5kZXJsaW5lX2F0X2Rlc2NlbnRfbGluZSwg IngtdW5kZXJsaW5lLWF0LWRlc2NlbnQtbGluZSIpOwogCiAgIERFRlZBUl9MSVNQICgieC10b29s a2l0LXNjcm9sbC1iYXJzIiwgVnhfdG9vbGtpdF9zY3JvbGxfYmFycywKIAkgICAgICAgZG9jOiAv KiBTS0lQOiByZWFsIGRvYyBpbiB4dGVybS5jLiAgKi8pOwpkaWZmIC0tZ2l0IGEvc3JjL3hkaXNw LmMgYi9zcmMveGRpc3AuYwppbmRleCA5MTcwZDZiNzc3Li4xM2YyODFlOGVhIDEwMDY0NAotLS0g YS9zcmMveGRpc3AuYworKysgYi9zcmMveGRpc3AuYwpAQCAtMzI5NzgsNiArMzI5NzgsNyBAQCBw YXJ0aWN1bGFybHkgd2hlbiB1c2luZyB2YXJpYWJsZSBgeC11c2UtdW5kZXJsaW5lLXBvc2l0aW9u LXByb3BlcnRpZXMnCiB3aXRoIGZvbnRzIHRoYXQgc3BlY2lmeSBhbiBVTkRFUkxJTkVfUE9TSVRJ T04gcmVsYXRpdmVseSBjbG9zZSB0byB0aGUKIGJhc2VsaW5lLiAgVGhlIGRlZmF1bHQgdmFsdWUg aXMgMS4gICovKTsKICAgdW5kZXJsaW5lX21pbmltdW1fb2Zmc2V0ID0gMTsKKyAgREVGU1lNIChR dW5kZXJsaW5lX21pbmltdW1fb2Zmc2V0LCAidW5kZXJsaW5lLW1pbmltdW0tb2Zmc2V0Iik7CiAK ICAgREVGVkFSX0JPT0wgKCJkaXNwbGF5LWhvdXJnbGFzcyIsIGRpc3BsYXlfaG91cmdsYXNzX3As CiAJICAgICAgIGRvYzogLyogTm9uLW5pbCBtZWFucyBzaG93IGFuIGhvdXJnbGFzcyBwb2ludGVy LCB3aGVuIEVtYWNzIGlzIGJ1c3kuCmRpZmYgLS1naXQgYS9zcmMveHRlcm0uYyBiL3NyYy94dGVy bS5jCmluZGV4IDBkMjVjN2YxYTIuLmFiYzliZTEyYzkgMTAwNjQ0Ci0tLSBhL3NyYy94dGVybS5j CisrKyBiL3NyYy94dGVybS5jCkBAIC0zNzA3LDEzICszNzA3LDIxIEBAIHhfZHJhd19nbHlwaF9z dHJpbmcgKHN0cnVjdCBnbHlwaF9zdHJpbmcgKnMpCiAgICAgICAgICAgICAgIGVsc2UKICAgICAg ICAgICAgICAgICB7CiAJCSAgc3RydWN0IGZvbnQgKmZvbnQgPSBmb250X2Zvcl91bmRlcmxpbmVf bWV0cmljcyAocyk7CisgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBsb25nIG1pbmltdW1fb2Zm c2V0OworICAgICAgICAgICAgICAgICAgTGlzcF9PYmplY3QgdmFsID0gYnVmZmVyX2xvY2FsX3Zh bHVlIChRdW5kZXJsaW5lX21pbmltdW1fb2Zmc2V0LAorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzLT53LT5jb250ZW50cyk7CisgICAgICAg ICAgICAgICAgICBpZiAoSU5URUdFUlAgKHZhbCkpCisgICAgICAgICAgICAgICAgICAgIG1pbmlt dW1fb2Zmc2V0ID0gWEZBU1RJTlQgKHZhbCk7CisgICAgICAgICAgICAgICAgICBlbHNlCisgICAg ICAgICAgICAgICAgICAgIG1pbmltdW1fb2Zmc2V0ID0gMTsKIAogICAgICAgICAgICAgICAgICAg LyogR2V0IHRoZSB1bmRlcmxpbmUgdGhpY2tuZXNzLiAgRGVmYXVsdCBpcyAxIHBpeGVsLiAgKi8K ICAgICAgICAgICAgICAgICAgIGlmIChmb250ICYmIGZvbnQtPnVuZGVybGluZV90aGlja25lc3Mg PiAwKQogICAgICAgICAgICAgICAgICAgICB0aGlja25lc3MgPSBmb250LT51bmRlcmxpbmVfdGhp Y2tuZXNzOwogICAgICAgICAgICAgICAgICAgZWxzZQogICAgICAgICAgICAgICAgICAgICB0aGlj a25lc3MgPSAxOwotICAgICAgICAgICAgICAgICAgaWYgKHhfdW5kZXJsaW5lX2F0X2Rlc2NlbnRf bGluZSkKKyAgICAgICAgICAgICAgICAgIGlmICghTklMUCAoRmJ1ZmZlcl9sb2NhbF92YWx1ZSAo UXhfdW5kZXJsaW5lX2F0X2Rlc2NlbnRfbGluZSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgcy0+dy0+Y29udGVudHMpKSkKICAgICAgICAgICAgICAg ICAgICAgcG9zaXRpb24gPSAocy0+aGVpZ2h0IC0gdGhpY2tuZXNzKSAtIChzLT55YmFzZSAtIHMt PnkpOwogICAgICAgICAgICAgICAgICAgZWxzZQogICAgICAgICAgICAgICAgICAgICB7CkBAIC0z NzI1LDE1ICszNzMzLDE2IEBAIHhfZHJhd19nbHlwaF9zdHJpbmcgKHN0cnVjdCBnbHlwaF9zdHJp bmcgKnMpCiAgICAgICAgICAgICAgICAgICAgICAgICAgUk9VTkQgKChtYXhpbXVtIGRlc2NlbnQp IC8gMiksIHdpdGgKICAgICAgICAgICAgICAgICAgICAgICAgICBST1VORCh4KSA9IGZsb29yICh4 ICsgMC41KSAgKi8KIAotICAgICAgICAgICAgICAgICAgICAgIGlmICh4X3VzZV91bmRlcmxpbmVf cG9zaXRpb25fcHJvcGVydGllcworICAgICAgICAgICAgICAgICAgICAgIGlmICghTklMUCAoRmJ1 ZmZlcl9sb2NhbF92YWx1ZSAoUXhfdXNlX3VuZGVybGluZV9wb3NpdGlvbl9wcm9wZXJ0aWVzLAor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcy0+ dy0+Y29udGVudHMpKQogICAgICAgICAgICAgICAgICAgICAgICAgICAmJiBmb250ICYmIGZvbnQt PnVuZGVybGluZV9wb3NpdGlvbiA+PSAwKQogICAgICAgICAgICAgICAgICAgICAgICAgcG9zaXRp b24gPSBmb250LT51bmRlcmxpbmVfcG9zaXRpb247CiAgICAgICAgICAgICAgICAgICAgICAgZWxz ZSBpZiAoZm9udCkKICAgICAgICAgICAgICAgICAgICAgICAgIHBvc2l0aW9uID0gKGZvbnQtPmRl c2NlbnQgKyAxKSAvIDI7CiAgICAgICAgICAgICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAg ICAgICAgICAgICAgcG9zaXRpb24gPSB1bmRlcmxpbmVfbWluaW11bV9vZmZzZXQ7CisgICAgICAg ICAgICAgICAgICAgICAgICBwb3NpdGlvbiA9IG1pbmltdW1fb2Zmc2V0OwogICAgICAgICAgICAg ICAgICAgICB9Ci0gICAgICAgICAgICAgICAgICBwb3NpdGlvbiA9IG1heCAocG9zaXRpb24sIHVu ZGVybGluZV9taW5pbXVtX29mZnNldCk7CisgICAgICAgICAgICAgICAgICBwb3NpdGlvbiA9IG1h eCAocG9zaXRpb24sIG1pbmltdW1fb2Zmc2V0KTsKICAgICAgICAgICAgICAgICB9CiAgICAgICAg ICAgICAgIC8qIENoZWNrIHRoZSBzYW5pdHkgb2YgdGhpY2tuZXNzIGFuZCBwb3NpdGlvbi4gIFdl IHNob3VsZAogICAgICAgICAgICAgICAgICBhdm9pZCBkcmF3aW5nIHVuZGVybGluZSBvdXQgb2Yg dGhlIGN1cnJlbnQgbGluZSBhcmVhLiAgKi8KQEAgLTEzMjQ2LDYgKzEzMjU1LDcgQEAgVU5ERVJM SU5FX1BPU0lUSU9OIGZvbnQgcHJvcGVydGllcywgc2V0IHRoaXMgdG8gbmlsLiAgWW91IGNhbiBh bHNvIHVzZQogYHVuZGVybGluZS1taW5pbXVtLW9mZnNldCcgdG8gb3ZlcnJpZGUgdGhlIGZvbnQn cyBVTkRFUkxJTkVfUE9TSVRJT04gZm9yCiBzbWFsbCBmb250IGRpc3BsYXkgc2l6ZXMuICAqLyk7 CiAgIHhfdXNlX3VuZGVybGluZV9wb3NpdGlvbl9wcm9wZXJ0aWVzID0gdHJ1ZTsKKyAgREVGU1lN IChReF91c2VfdW5kZXJsaW5lX3Bvc2l0aW9uX3Byb3BlcnRpZXMsICJ4LXVzZS11bmRlcmxpbmUt cG9zaXRpb24tcHJvcGVydGllcyIpOwogCiAgIERFRlZBUl9CT09MICgieC11bmRlcmxpbmUtYXQt ZGVzY2VudC1saW5lIiwKIAkgICAgICAgeF91bmRlcmxpbmVfYXRfZGVzY2VudF9saW5lLApAQCAt MTMyNTYsNiArMTMyNjYsNyBAQCBBIHZhbHVlIG9mIG5pbCBtZWFucyB0byBkcmF3IHRoZSB1bmRl cmxpbmUgYWNjb3JkaW5nIHRvIHRoZSB2YWx1ZSBvZiB0aGUKIHZhcmlhYmxlIGB4LXVzZS11bmRl cmxpbmUtcG9zaXRpb24tcHJvcGVydGllcycsIHdoaWNoIGlzIHVzdWFsbHkgYXQgdGhlCiBiYXNl bGluZSBsZXZlbC4gIFRoZSBkZWZhdWx0IHZhbHVlIGlzIG5pbC4gICovKTsKICAgeF91bmRlcmxp bmVfYXRfZGVzY2VudF9saW5lID0gZmFsc2U7CisgIERFRlNZTSAoUXhfdW5kZXJsaW5lX2F0X2Rl c2NlbnRfbGluZSwgIngtdW5kZXJsaW5lLWF0LWRlc2NlbnQtbGluZSIpOwogCiAgIERFRlZBUl9C T09MICgieC1tb3VzZS1jbGljay1mb2N1cy1pZ25vcmUtcG9zaXRpb24iLAogCSAgICAgICB4X21v dXNlX2NsaWNrX2ZvY3VzX2lnbm9yZV9wb3NpdGlvbiwKLS0gCjIuMTUuMQoK --089e082cd9f46cbfec0566474304--