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: Tue, 27 Feb 2018 06:19:00 -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> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="94eb2c048e20ebd7560566324e66" X-Trace: blaine.gmane.org 1519741094 23567 195.159.176.226 (27 Feb 2018 14:18:14 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Tue, 27 Feb 2018 14:18:14 +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 Tue Feb 27 15:18:10 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 1eqg53-0005ch-8I for geb-bug-gnu-emacs@m.gmane.org; Tue, 27 Feb 2018 15:18:09 +0100 Original-Received: from localhost ([::1]:37562 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eqg75-0002u4-M5 for geb-bug-gnu-emacs@m.gmane.org; Tue, 27 Feb 2018 09:20:15 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:49761) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eqg6v-0002tR-VN for bug-gnu-emacs@gnu.org; Tue, 27 Feb 2018 09:20:06 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eqg6s-0007p4-PB for bug-gnu-emacs@gnu.org; Tue, 27 Feb 2018 09:20:05 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:54897) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eqg6s-0007p0-KQ for bug-gnu-emacs@gnu.org; Tue, 27 Feb 2018 09:20:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eqg6s-0003HA-Ep for bug-gnu-emacs@gnu.org; Tue, 27 Feb 2018 09: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: Tue, 27 Feb 2018 14: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.151974114912516 (code B ref 30553); Tue, 27 Feb 2018 14:20:02 +0000 Original-Received: (at 30553) by debbugs.gnu.org; 27 Feb 2018 14:19:09 +0000 Original-Received: from localhost ([127.0.0.1]:34561 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eqg61-0003Fn-Ar for submit@debbugs.gnu.org; Tue, 27 Feb 2018 09:19:09 -0500 Original-Received: from mail-qk0-f182.google.com ([209.85.220.182]:45895) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eqg5z-0003FP-GH for 30553@debbugs.gnu.org; Tue, 27 Feb 2018 09:19:07 -0500 Original-Received: by mail-qk0-f182.google.com with SMTP id g2so23653910qkd.12 for <30553@debbugs.gnu.org>; Tue, 27 Feb 2018 06:19:07 -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=ualWAh0Lqrx1hWjrMd7VAoriWqh9Z+S8J6F60rZokv8=; b=srs+nD1uNBbhfiXThGqR0KueNf1msqjJ3m90LDSrFWJrkDw8vPdunJJvNyDqOHQeKk k4SBlA6SDVgt6EQnM06gXSOUV2jLvMF8TIuwZhgEtD9AkohMmH1wb3urEKDHdqcvcW1B U/agASDZTlUVgfARNe8DOgzHc9mSEF5vZxx556oTipJIZTMmpAcA6iceOk4Z38sbcg/P oLPS6rvheyVucAtYM8fVneL9OLD9G5pd1200cT3z3wbTdTmyW0GTaMvhYQnY3uQ1Ad4g 9GvzwTNsURJTK9evE2km+3JV9LtyL6b/WTyp7HsyVoDiankGIppeepqukYQVcvLzIjD2 zI8w== 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=ualWAh0Lqrx1hWjrMd7VAoriWqh9Z+S8J6F60rZokv8=; b=jPzzdocWQhXmRESCvR1lzd8qgv39we/AHL0rHX2SizbhJ21tsttfo42TcHgPW00RI6 PXGE+3jat3aPurUFUWUnuKLsNOubwQ4qSncms/tWKYyrtDnT/pmz9P8I2sJOqNPJ+2RO /VIh6grJBab33wInSml53h9gqmNIRTZS84ML1yKdGHRUdxcRwZnJtJK3XCOvlpvXGQWL M3veSBQLZkdl/6aPsWAvL3ch2y7/WCcGrCuV7fOPEgyaHH/O4O09Dut0ndaZoU6Wwgc/ t8ebUeZUJgPKifxkUUCNbgcg6Dx//Mw5LVhocp8+TRkCDH37hRc1VPDab6gvIV2VncH1 ExIg== X-Gm-Message-State: APf1xPAIIkaep2nhXSJIMH2pdwDCHJ6JsevkXIUDIxaaHjPRLmVSVN3E jBArGlRnIMzj+a+hp6Ahi07nnSnUbFLvH4pnt0Q= X-Google-Smtp-Source: AG47ELvfbYPJ2epteUG4fQchcc3vAcO00hamumHYLpPUype4iJTN2VSzAkBK2cduJNHjJqwLnl7kczwemOT8DNOICPM= X-Received: by 10.55.188.5 with SMTP id m5mr1543187qkf.321.1519741141997; Tue, 27 Feb 2018 06:19:01 -0800 (PST) Original-Received: by 10.237.54.65 with HTTP; Tue, 27 Feb 2018 06:19:00 -0800 (PST) In-Reply-To: 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:143700 Archived-At: --94eb2c048e20ebd7560566324e66 Content-Type: text/plain; charset="UTF-8" Patch for buffer local underline position variables. I ended up making underline-minimum-offset buffer local capable as well. --94eb2c048e20ebd7560566324e66 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_je5ql7no0 RnJvbSBjZDFhNTJhMDU4NzgyMjgyODgzNmU3ODc5YjVlZTEzMjE1OTVkNjBjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBYXJvbiBKZW5zZW4gPGFhcm9uamVuc2VuQGdtYWlsLmNvbT4K RGF0ZTogVHVlLCAyNyBGZWIgMjAxOCAwNjowNTowMyAtMDgwMApTdWJqZWN0OiBbUEFUQ0hdIEFs bG93IGJ1ZmZlciBsb2NhbCB1bmRlcmxpbmUgcG9zaXRpb24gdmFycwoKKiBzcmMvbnN0ZXJtLm0g KG5zX2RyYXdfdGV4dF9kZWNvcmF0aW9uKToKKiBzcmMvdzMydGVybS5jICh4X2RyYXdfZ2x5cGhf c3RyaW5nKToKKiBzcmMveHRlcm0uYyAoeF9kcmF3X2dseXBoX3N0cmluZyk6IEFsbG93IGJ1ZmZl ciBsb2NhbCB1bmRlcmxpbmUKcG9zaXRpb24gdmFycwotLS0KIHNyYy9uc3Rlcm0ubSAgfCAxNSAr KysrKysrKysrKy0tLS0KIHNyYy93MzJ0ZXJtLmMgfCAxMiArKysrKysrKystLS0KIHNyYy94dGVy bS5jICAgfCAxNSArKysrKysrKysrKy0tLS0KIDMgZmlsZXMgY2hhbmdlZCwgMzEgaW5zZXJ0aW9u cygrKSwgMTEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvc3JjL25zdGVybS5tIGIvc3JjL25z dGVybS5tCmluZGV4IDE5MTljNmRlZmEuLjdlZmQ3Y2Y4ODcgMTAwNjQ0Ci0tLSBhL3NyYy9uc3Rl cm0ubQorKysgYi9zcmMvbnN0ZXJtLm0KQEAgLTM0ODcsMjMgKzM0ODcsMjYgQEAgTm90ZSB0aGF0 IENVUlNPUl9XSURUSCBpcyBtZWFuaW5nZnVsIG9ubHkgZm9yIChoKWJhciBjdXJzb3JzLgogICAg ICAgICAgICAgewogCSAgICAgIHN0cnVjdCBmb250ICpmb250ID0gZm9udF9mb3JfdW5kZXJsaW5l X21ldHJpY3MgKHMpOwogICAgICAgICAgICAgICB1bnNpZ25lZCBsb25nIGRlc2NlbnQgPSBzLT55 ICsgcy0+aGVpZ2h0IC0gcy0+eWJhc2U7CisgICAgICAgICAgICAgIHVuc2lnbmVkIGxvbmcgbWlu aW11bV9vZmZzZXQgPQorICAgICAgICAgICAgICAgIGJ1ZmZlcl9sb2NhbF92YWx1ZSAoUXVuZGVy bGluZV9taW5pbXVtX29mZnNldCwgcy0+dy0+Y29udGVudHMpOwogCiAgICAgICAgICAgICAgIC8q IFVzZSB1bmRlcmxpbmUgdGhpY2tuZXNzIG9mIGZvbnQsIGRlZmF1bHRpbmcgdG8gMS4gKi8KICAg ICAgICAgICAgICAgdGhpY2tuZXNzID0gKGZvbnQgJiYgZm9udC0+dW5kZXJsaW5lX3RoaWNrbmVz cyA+IDApCiAgICAgICAgICAgICAgICAgPyBmb250LT51bmRlcmxpbmVfdGhpY2tuZXNzIDogMTsK IAogICAgICAgICAgICAgICAvKiBEZXRlcm1pbmUgdGhlIG9mZnNldCBvZiB1bmRlcmxpbmluZyBm cm9tIHRoZSBiYXNlbGluZS4gKi8KLSAgICAgICAgICAgICAgaWYgKHhfdW5kZXJsaW5lX2F0X2Rl c2NlbnRfbGluZSkKKyAgICAgICAgICAgICAgaWYgKGJ1ZmZlcl9sb2NhbF92YWx1ZSAoUXhfdW5k ZXJsaW5lX2F0X2Rlc2NlbnRfbGluZSwgcy0+dy0+Y29udGVudHMpKQogICAgICAgICAgICAgICAg IHBvc2l0aW9uID0gZGVzY2VudCAtIHRoaWNrbmVzczsKLSAgICAgICAgICAgICAgZWxzZSBpZiAo eF91c2VfdW5kZXJsaW5lX3Bvc2l0aW9uX3Byb3BlcnRpZXMKKyAgICAgICAgICAgICAgZWxzZSBp ZiAoYnVmZmVyX2xvY2FsX3ZhbHVlIChReF91c2VfdW5kZXJsaW5lX3Bvc2l0aW9uX3Byb3BlcnRp ZXMsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcy0+dy0+Y29u dGVudHMpCiAgICAgICAgICAgICAgICAgICAgICAgICYmIGZvbnQgJiYgZm9udC0+dW5kZXJsaW5l X3Bvc2l0aW9uID49IDApCiAgICAgICAgICAgICAgICAgcG9zaXRpb24gPSBmb250LT51bmRlcmxp bmVfcG9zaXRpb247CiAgICAgICAgICAgICAgIGVsc2UgaWYgKGZvbnQpCiAgICAgICAgICAgICAg ICAgcG9zaXRpb24gPSBscm91bmQgKGZvbnQtPmRlc2NlbnQgLyAyKTsKICAgICAgICAgICAgICAg ZWxzZQotICAgICAgICAgICAgICAgIHBvc2l0aW9uID0gdW5kZXJsaW5lX21pbmltdW1fb2Zmc2V0 OworICAgICAgICAgICAgICAgIHBvc2l0aW9uID0gbWluaW11bV9vZmZzZXQ7CiAKLSAgICAgICAg ICAgICAgcG9zaXRpb24gPSBtYXggKHBvc2l0aW9uLCB1bmRlcmxpbmVfbWluaW11bV9vZmZzZXQp OworICAgICAgICAgICAgICBwb3NpdGlvbiA9IG1heCAocG9zaXRpb24sIG1pbmltdW1fb2Zmc2V0 KTsKIAogICAgICAgICAgICAgICAvKiBFbnN1cmUgdW5kZXJsaW5pbmcgaXMgbm90IGNyb3BwZWQu ICovCiAgICAgICAgICAgICAgIGlmIChkZXNjZW50IDw9IHBvc2l0aW9uKQpAQCAtOTQ2NSwxMSAr OTQ2OCwxNSBAQCBOaWwgbWVhbnMgdXNlIGZ1bGxzY3JlZW4gdGhlIG9sZCAoPCAxMC43KSB3YXku ICBUaGUgb2xkIHdheSB3b3JrcyBiZXR0ZXIgd2l0aAogCSAgICAgICB4X3VzZV91bmRlcmxpbmVf cG9zaXRpb25fcHJvcGVydGllcywKICAgICAgZG9jOiAvKiBTS0lQOiByZWFsIGRvYyBpbiB4dGVy bS5jLiAgKi8pOwogICB4X3VzZV91bmRlcmxpbmVfcG9zaXRpb25fcHJvcGVydGllcyA9IDA7Cisg IERFRlNZTSAoUXhfdXNlX3VuZGVybGluZV9wb3NpdGlvbl9wcm9wZXJ0aWVzLCAieC11c2UtdW5k ZXJsaW5lLXBvc2l0aW9uLXByb3BlcnRpZXMiKTsKKworICBERUZTWU0gKFF1bmRlcmxpbmVfbWlu aW11bV9vZmZzZXQsICJ1bmRlcmxpbmUtbWluaW11bS1vZmZzZXQiKTsKIAogICBERUZWQVJfQk9P TCAoIngtdW5kZXJsaW5lLWF0LWRlc2NlbnQtbGluZSIsCiAJICAgICAgIHhfdW5kZXJsaW5lX2F0 X2Rlc2NlbnRfbGluZSwKICAgICAgZG9jOiAvKiBTS0lQOiByZWFsIGRvYyBpbiB4dGVybS5jLiAg Ki8pOwogICB4X3VuZGVybGluZV9hdF9kZXNjZW50X2xpbmUgPSAwOworICBERUZTWU0gKFF4X3Vu ZGVybGluZV9hdF9kZXNjZW50X2xpbmUsICJ4LXVuZGVybGluZS1hdC1kZXNjZW50LWxpbmUiKTsK IAogICAvKiBUZWxsIEVtYWNzIGFib3V0IHRoaXMgd2luZG93IHN5c3RlbS4gICovCiAgIEZwcm92 aWRlIChRbnMsIFFuaWwpOwpkaWZmIC0tZ2l0IGEvc3JjL3czMnRlcm0uYyBiL3NyYy93MzJ0ZXJt LmMKaW5kZXggOTdhZmI2NzhjMS4uMTIyNTc3NmY0YSAxMDA2NDQKLS0tIGEvc3JjL3czMnRlcm0u YworKysgYi9zcmMvdzMydGVybS5jCkBAIC0yNDgxLDcgKzI0ODEsOCBAQCB4X2RyYXdfZ2x5cGhf c3RyaW5nIChzdHJ1Y3QgZ2x5cGhfc3RyaW5nICpzKQogICAgICAgICAgICAgICAgICAgICB0aGlj a25lc3MgPSBmb250LT51bmRlcmxpbmVfdGhpY2tuZXNzOwogICAgICAgICAgICAgICAgICAgZWxz ZQogICAgICAgICAgICAgICAgICAgICB0aGlja25lc3MgPSAxOwotICAgICAgICAgICAgICAgICAg aWYgKHhfdW5kZXJsaW5lX2F0X2Rlc2NlbnRfbGluZSB8fCAhZm9udCkKKyAgICAgICAgICAgICAg ICAgIGlmIChidWZmZXJfbG9jYWxfdmFsdWUgKFF4X3VuZGVybGluZV9hdF9kZXNjZW50X2xpbmUs IHMtPnctPmNvbnRlbnRzKQorICAgICAgICAgICAgICAgICAgICAgIHx8ICFmb250KQogICAgICAg ICAgICAgICAgICAgICBwb3NpdGlvbiA9IChzLT5oZWlnaHQgLSB0aGlja25lc3MpIC0gKHMtPnli YXNlIC0gcy0+eSk7CiAgICAgICAgICAgICAgICAgICBlbHNlCiAgICAgICAgICAgICAgICAgICAg IHsKQEAgLTI0OTMsMTMgKzI0OTQsMTUgQEAgeF9kcmF3X2dseXBoX3N0cmluZyAoc3RydWN0IGds eXBoX3N0cmluZyAqcykKICAgICAgICAgICAgICAgICAgICAgICAgICBST1VORCAoKG1heGltdW1f ZGVzY2VudCkgLyAyKSwgd2l0aAogICAgICAgICAgICAgICAgICAgICAgICAgIFJPVU5EICh4KSA9 IGZsb29yICh4ICsgMC41KSAgKi8KIAotICAgICAgICAgICAgICAgICAgICAgIGlmICh4X3VzZV91 bmRlcmxpbmVfcG9zaXRpb25fcHJvcGVydGllcworICAgICAgICAgICAgICAgICAgICAgIGlmIChi dWZmZXJfbG9jYWxfdmFsdWUgKFF4X3VzZV91bmRlcmxpbmVfcG9zaXRpb25fcHJvcGVydGllcywK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzLT53LT5jb250 ZW50cykKICAgICAgICAgICAgICAgICAgICAgICAgICAgJiYgZm9udC0+dW5kZXJsaW5lX3Bvc2l0 aW9uID49IDApCiAgICAgICAgICAgICAgICAgICAgICAgICBwb3NpdGlvbiA9IGZvbnQtPnVuZGVy bGluZV9wb3NpdGlvbjsKICAgICAgICAgICAgICAgICAgICAgICBlbHNlCiAgICAgICAgICAgICAg ICAgICAgICAgICBwb3NpdGlvbiA9IChmb250LT5kZXNjZW50ICsgMSkgLyAyOwogICAgICAgICAg ICAgICAgICAgICB9Ci0gICAgICAgICAgICAgICAgICBwb3NpdGlvbiA9IG1heCAocG9zaXRpb24s IHVuZGVybGluZV9taW5pbXVtX29mZnNldCk7CisgICAgICAgICAgICAgICAgICBwb3NpdGlvbiA9 IG1heCAocG9zaXRpb24sIGJ1ZmZlcl9sb2NhbF92YWx1ZSAoUXVuZGVybGluZV9taW5pbXVtX29m ZnNldCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBzLT53LT5jb250ZW50cykpOwogICAgICAgICAgICAgICAgIH0KICAgICAg ICAgICAgICAgLyogQ2hlY2sgdGhlIHNhbml0eSBvZiB0aGlja25lc3MgYW5kIHBvc2l0aW9uLiAg V2Ugc2hvdWxkCiAgICAgICAgICAgICAgICAgIGF2b2lkIGRyYXdpbmcgdW5kZXJsaW5lIG91dCBv ZiB0aGUgY3VycmVudCBsaW5lIGFyZWEuICAqLwpAQCAtNzM4NSwxMSArNzM4OCwxNCBAQCB0aGUg Y3Vyc29yIGhhdmUgbm8gZWZmZWN0LiAgKi8pOwogCSAgICAgICB4X3VzZV91bmRlcmxpbmVfcG9z aXRpb25fcHJvcGVydGllcywKICAgICAgZG9jOiAvKiBTS0lQOiByZWFsIGRvYyBpbiB4dGVybS5j LiAgKi8pOwogICB4X3VzZV91bmRlcmxpbmVfcG9zaXRpb25fcHJvcGVydGllcyA9IDA7CisgIERF RlNZTSAoUXhfdXNlX3VuZGVybGluZV9wb3NpdGlvbl9wcm9wZXJ0aWVzLCAieC11c2UtdW5kZXJs aW5lLXBvc2l0aW9uLXByb3BlcnRpZXMiKTsKIAogICBERUZWQVJfQk9PTCAoIngtdW5kZXJsaW5l LWF0LWRlc2NlbnQtbGluZSIsCiAJICAgICAgIHhfdW5kZXJsaW5lX2F0X2Rlc2NlbnRfbGluZSwK ICAgICAgZG9jOiAvKiBTS0lQOiByZWFsIGRvYyBpbiB4dGVybS5jLiAgKi8pOwogICB4X3VuZGVy bGluZV9hdF9kZXNjZW50X2xpbmUgPSAwOworICBERUZTWU0gKFF4X3VuZGVybGluZV9hdF9kZXNj ZW50X2xpbmUsICJ4LXVuZGVybGluZS1hdC1kZXNjZW50LWxpbmUiKTsKKyAgREVGU1lNIChRdW5k ZXJsaW5lX21pbmltdW1fb2Zmc2V0LCAidW5kZXJsaW5lLW1pbmltdW0tb2Zmc2V0Iik7CiAKICAg REVGVkFSX0xJU1AgKCJ4LXRvb2xraXQtc2Nyb2xsLWJhcnMiLCBWeF90b29sa2l0X3Njcm9sbF9i YXJzLAogCSAgICAgICBkb2M6IC8qIFNLSVA6IHJlYWwgZG9jIGluIHh0ZXJtLmMuICAqLyk7CmRp ZmYgLS1naXQgYS9zcmMveHRlcm0uYyBiL3NyYy94dGVybS5jCmluZGV4IDBkMjVjN2YxYTIuLjM0 YzgwYzUyMmIgMTAwNjQ0Ci0tLSBhL3NyYy94dGVybS5jCisrKyBiL3NyYy94dGVybS5jCkBAIC0z NzA3LDEzICszNzA3LDE1IEBAIHhfZHJhd19nbHlwaF9zdHJpbmcgKHN0cnVjdCBnbHlwaF9zdHJp bmcgKnMpCiAgICAgICAgICAgICAgIGVsc2UKICAgICAgICAgICAgICAgICB7CiAJCSAgc3RydWN0 IGZvbnQgKmZvbnQgPSBmb250X2Zvcl91bmRlcmxpbmVfbWV0cmljcyAocyk7CisgICAgICAgICAg ICAgICAgICB1bnNpZ25lZCBsb25nIG1pbmltdW1fb2Zmc2V0ID0KKyAgICAgICAgICAgICAgICAg ICAgYnVmZmVyX2xvY2FsX3ZhbHVlIChRdW5kZXJsaW5lX21pbmltdW1fb2Zmc2V0LCBzLT53LT5j b250ZW50cyk7CiAKICAgICAgICAgICAgICAgICAgIC8qIEdldCB0aGUgdW5kZXJsaW5lIHRoaWNr bmVzcy4gIERlZmF1bHQgaXMgMSBwaXhlbC4gICovCiAgICAgICAgICAgICAgICAgICBpZiAoZm9u dCAmJiBmb250LT51bmRlcmxpbmVfdGhpY2tuZXNzID4gMCkKICAgICAgICAgICAgICAgICAgICAg dGhpY2tuZXNzID0gZm9udC0+dW5kZXJsaW5lX3RoaWNrbmVzczsKICAgICAgICAgICAgICAgICAg IGVsc2UKICAgICAgICAgICAgICAgICAgICAgdGhpY2tuZXNzID0gMTsKLSAgICAgICAgICAgICAg ICAgIGlmICh4X3VuZGVybGluZV9hdF9kZXNjZW50X2xpbmUpCisgICAgICAgICAgICAgICAgICBp ZiAoYnVmZmVyX2xvY2FsX3ZhbHVlIChReF91bmRlcmxpbmVfYXRfZGVzY2VudF9saW5lLCBzLT53 LT5jb250ZW50cykpCiAgICAgICAgICAgICAgICAgICAgIHBvc2l0aW9uID0gKHMtPmhlaWdodCAt IHRoaWNrbmVzcykgLSAocy0+eWJhc2UgLSBzLT55KTsKICAgICAgICAgICAgICAgICAgIGVsc2UK ICAgICAgICAgICAgICAgICAgICAgewpAQCAtMzcyNSwxNSArMzcyNywxNiBAQCB4X2RyYXdfZ2x5 cGhfc3RyaW5nIChzdHJ1Y3QgZ2x5cGhfc3RyaW5nICpzKQogICAgICAgICAgICAgICAgICAgICAg ICAgIFJPVU5EICgobWF4aW11bSBkZXNjZW50KSAvIDIpLCB3aXRoCiAgICAgICAgICAgICAgICAg ICAgICAgICAgUk9VTkQoeCkgPSBmbG9vciAoeCArIDAuNSkgICovCiAKLSAgICAgICAgICAgICAg ICAgICAgICBpZiAoeF91c2VfdW5kZXJsaW5lX3Bvc2l0aW9uX3Byb3BlcnRpZXMKKyAgICAgICAg ICAgICAgICAgICAgICBpZiAoYnVmZmVyX2xvY2FsX3ZhbHVlIChReF91c2VfdW5kZXJsaW5lX3Bv c2l0aW9uX3Byb3BlcnRpZXMsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgcy0+dy0+Y29udGVudHMpCiAgICAgICAgICAgICAgICAgICAgICAgICAgICYmIGZv bnQgJiYgZm9udC0+dW5kZXJsaW5lX3Bvc2l0aW9uID49IDApCiAgICAgICAgICAgICAgICAgICAg ICAgICBwb3NpdGlvbiA9IGZvbnQtPnVuZGVybGluZV9wb3NpdGlvbjsKICAgICAgICAgICAgICAg ICAgICAgICBlbHNlIGlmIChmb250KQogICAgICAgICAgICAgICAgICAgICAgICAgcG9zaXRpb24g PSAoZm9udC0+ZGVzY2VudCArIDEpIC8gMjsKICAgICAgICAgICAgICAgICAgICAgICBlbHNlCi0g ICAgICAgICAgICAgICAgICAgICAgICBwb3NpdGlvbiA9IHVuZGVybGluZV9taW5pbXVtX29mZnNl dDsKKyAgICAgICAgICAgICAgICAgICAgICAgIHBvc2l0aW9uID0gbWluaW11bV9vZmZzZXQ7CiAg ICAgICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgICAgICAgIHBvc2l0aW9uID0gbWF4IChw b3NpdGlvbiwgdW5kZXJsaW5lX21pbmltdW1fb2Zmc2V0KTsKKyAgICAgICAgICAgICAgICAgIHBv c2l0aW9uID0gbWF4IChwb3NpdGlvbiwgbWluaW11bV9vZmZzZXQpOwogICAgICAgICAgICAgICAg IH0KICAgICAgICAgICAgICAgLyogQ2hlY2sgdGhlIHNhbml0eSBvZiB0aGlja25lc3MgYW5kIHBv c2l0aW9uLiAgV2Ugc2hvdWxkCiAgICAgICAgICAgICAgICAgIGF2b2lkIGRyYXdpbmcgdW5kZXJs aW5lIG91dCBvZiB0aGUgY3VycmVudCBsaW5lIGFyZWEuICAqLwpAQCAtMTMyNDYsNiArMTMyNDks OSBAQCBVTkRFUkxJTkVfUE9TSVRJT04gZm9udCBwcm9wZXJ0aWVzLCBzZXQgdGhpcyB0byBuaWwu ICBZb3UgY2FuIGFsc28gdXNlCiBgdW5kZXJsaW5lLW1pbmltdW0tb2Zmc2V0JyB0byBvdmVycmlk ZSB0aGUgZm9udCdzIFVOREVSTElORV9QT1NJVElPTiBmb3IKIHNtYWxsIGZvbnQgZGlzcGxheSBz aXplcy4gICovKTsKICAgeF91c2VfdW5kZXJsaW5lX3Bvc2l0aW9uX3Byb3BlcnRpZXMgPSB0cnVl OworICBERUZTWU0gKFF4X3VzZV91bmRlcmxpbmVfcG9zaXRpb25fcHJvcGVydGllcywgIngtdXNl LXVuZGVybGluZS1wb3NpdGlvbi1wcm9wZXJ0aWVzIik7CisKKyAgREVGU1lNIChRdW5kZXJsaW5l X21pbmltdW1fb2Zmc2V0LCAidW5kZXJsaW5lLW1pbmltdW0tb2Zmc2V0Iik7CiAKICAgREVGVkFS X0JPT0wgKCJ4LXVuZGVybGluZS1hdC1kZXNjZW50LWxpbmUiLAogCSAgICAgICB4X3VuZGVybGlu ZV9hdF9kZXNjZW50X2xpbmUsCkBAIC0xMzI1Niw2ICsxMzI2Miw3IEBAIEEgdmFsdWUgb2Ygbmls IG1lYW5zIHRvIGRyYXcgdGhlIHVuZGVybGluZSBhY2NvcmRpbmcgdG8gdGhlIHZhbHVlIG9mIHRo ZQogdmFyaWFibGUgYHgtdXNlLXVuZGVybGluZS1wb3NpdGlvbi1wcm9wZXJ0aWVzJywgd2hpY2gg aXMgdXN1YWxseSBhdCB0aGUKIGJhc2VsaW5lIGxldmVsLiAgVGhlIGRlZmF1bHQgdmFsdWUgaXMg bmlsLiAgKi8pOwogICB4X3VuZGVybGluZV9hdF9kZXNjZW50X2xpbmUgPSBmYWxzZTsKKyAgREVG U1lNIChReF91bmRlcmxpbmVfYXRfZGVzY2VudF9saW5lLCAieC11bmRlcmxpbmUtYXQtZGVzY2Vu dC1saW5lIik7CiAKICAgREVGVkFSX0JPT0wgKCJ4LW1vdXNlLWNsaWNrLWZvY3VzLWlnbm9yZS1w b3NpdGlvbiIsCiAJICAgICAgIHhfbW91c2VfY2xpY2tfZm9jdXNfaWdub3JlX3Bvc2l0aW9uLAot LSAKMi4xNS4xCgo= --94eb2c048e20ebd7560566324e66--