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: Thu, 1 Mar 2018 00:36:46 -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> <83d10pytub.fsf@gnu.org> <83zi3txajh.fsf@gnu.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="94eb2c0b29f69ef67a056655c247" X-Trace: blaine.gmane.org 1519893321 8396 195.159.176.226 (1 Mar 2018 08:35:21 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Thu, 1 Mar 2018 08:35:21 +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 Thu Mar 01 09:35:16 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 1erJgJ-0001Ln-56 for geb-bug-gnu-emacs@m.gmane.org; Thu, 01 Mar 2018 09:35:15 +0100 Original-Received: from localhost ([::1]:48886 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1erJiJ-0005Cs-N9 for geb-bug-gnu-emacs@m.gmane.org; Thu, 01 Mar 2018 03:37:19 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:50796) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1erJi7-0005Ca-B3 for bug-gnu-emacs@gnu.org; Thu, 01 Mar 2018 03:37:10 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1erJi2-0001lw-8y for bug-gnu-emacs@gnu.org; Thu, 01 Mar 2018 03:37:07 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:58542) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1erJi2-0001lh-2R for bug-gnu-emacs@gnu.org; Thu, 01 Mar 2018 03:37:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1erJi1-0005Zt-Lj for bug-gnu-emacs@gnu.org; Thu, 01 Mar 2018 03:37:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Aaron Jensen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 01 Mar 2018 08:37:01 +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.151989341721430 (code B ref 30553); Thu, 01 Mar 2018 08:37:01 +0000 Original-Received: (at 30553) by debbugs.gnu.org; 1 Mar 2018 08:36:57 +0000 Original-Received: from localhost ([127.0.0.1]:38206 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1erJhv-0005ZZ-UM for submit@debbugs.gnu.org; Thu, 01 Mar 2018 03:36:57 -0500 Original-Received: from mail-qt0-f177.google.com ([209.85.216.177]:34404) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1erJhs-0005ZL-GJ for 30553@debbugs.gnu.org; Thu, 01 Mar 2018 03:36:54 -0500 Original-Received: by mail-qt0-f177.google.com with SMTP id l25so6571032qtj.1 for <30553@debbugs.gnu.org>; Thu, 01 Mar 2018 00:36:52 -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=eX+cho0sWTIPHYrhilws9+PrNU40A2U2RteYCASyZV0=; b=dBilTqRgNzXvX7ACeXbxnjgUBPq5pKm7rwVvysBJ5Eqb+BBPjCnVWGj2cuqmqlUdeM D7O7dvPBwAcuMkBxHLvlnVHTvDB+1KPV4OmKRH/+DimzK/suZKv7NPwpOS0G9BqhxC7l Y72hBkzgAcpZGyr3j2JmOljXU/bF8PZnz1LjFrhdlUlXUJnUvj/H9oaHitVr4Uf8Ouc/ olkOnIkC+lmD1m2hSXBgwX+4wFJT0ydiLc2fpM/1x11Ns3JAN8nb8wj9utF85FfcHEBx rJ6V7B6rl/j4/OckBkB2E2I//BUS/yypWIHblyxodQ//BhsQSpwVaIB/GqfrnbH+sF2k xFPQ== 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=eX+cho0sWTIPHYrhilws9+PrNU40A2U2RteYCASyZV0=; b=btCONDclsAK9W23wqYbnrO5WW2riP31h/TgHpBsGaE/R0TAiyxDmd7O0uC+l1kqYg2 hhHDhPTdZcb8MVphyT/iXfnY3fCAYYwEpCzIBALpU7JNQRfEMJwK6mCZNbBC60GS7RYl P32HdcUIoIT6PKSWFvBooaMw/84DJZb/AVrJvIRfsjUQoRIFvWcFHDhtPh4+f3krrruP iLapOOkZU40blP6nJ7ODr7J9HdeGvzBwvc+6qtzHpVet/b0deD55oq27usRkcf4KVm3t q40l1I1n0QhHxONRw7815LYGQxaugdXbdBXo4rleQV3CgwdVAYZZLthXaRPwX72n0xvA bE4w== X-Gm-Message-State: AElRT7ElDd2nIOdiwK0WhXFDYRjtS0rP0JrjuGp93suHs9QBKtodxbYv m1505MLIrH8wj8Wop+ZM98AZVIrItk6zPQrOagk= X-Google-Smtp-Source: AG47ELve8rIHyNj2oM73K56PTI7UQ2/cKClBdxZo76iamGSRQecA/xsTf2JIbZP1bdeX/SEfSpjwChDK8abiJsdCa5Q= X-Received: by 10.200.27.122 with SMTP id p55mr1666682qtk.254.1519893406995; Thu, 01 Mar 2018 00:36:46 -0800 (PST) Original-Received: by 10.237.54.65 with HTTP; Thu, 1 Mar 2018 00:36:46 -0800 (PST) In-Reply-To: <83zi3txajh.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:143777 Archived-At: --94eb2c0b29f69ef67a056655c247 Content-Type: text/plain; charset="UTF-8" On Wed, Feb 28, 2018 at 9:56 AM, Eli Zaretskii wrote: > Just treat Qunbound as the default value of the respective variable. Thank you for the assistance. New patch attached. Please let me know if there are any other improvements I can make. Thanks! --94eb2c0b29f69ef67a056655c247 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_je89a8hp0 RnJvbSA1MWMyYjAwM2Q0NjcxMTE0OTg4OTI0YmQ4YTZjZWM1Zjg1MjJhMWMzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBYXJvbiBKZW5zZW4gPGFhcm9uamVuc2VuQGdtYWlsLmNvbT4K RGF0ZTogV2VkLCAyOCBGZWIgMjAxOCAwNzoxNzoxNCAtMDgwMApTdWJqZWN0OiBbUEFUQ0hdIEFs bG93IGJ1ZmZlciBsb2NhbCB1bmRlcmxpbmUgcG9zaXRpb24gdmFycwoKKiBzcmMvbnN0ZXJtLm0g KG5zX2RyYXdfdGV4dF9kZWNvcmF0aW9uKToKKiBzcmMvdzMydGVybS5jICh4X2RyYXdfZ2x5cGhf c3RyaW5nKToKKiBzcmMveHRlcm0uYyAoeF9kcmF3X2dseXBoX3N0cmluZyk6IEFsbG93IGJ1ZmZl ciBsb2NhbCB1bmRlcmxpbmUKcG9zaXRpb24gdmFycwoKKiBzcmMveGRpc3AuYzogQWRkIHN5bWJv bAotLS0KIHNyYy9uc3Rlcm0ubSAgfCAyNCArKysrKysrKysrKysrKysrKysrKy0tLS0KIHNyYy93 MzJ0ZXJtLmMgfCAyMyArKysrKysrKysrKysrKysrKysrKy0tLQogc3JjL3hkaXNwLmMgICB8ICAx ICsKIHNyYy94dGVybS5jICAgfCAyNCArKysrKysrKysrKysrKysrKysrKy0tLS0KIDQgZmlsZXMg Y2hhbmdlZCwgNjEgaW5zZXJ0aW9ucygrKSwgMTEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv c3JjL25zdGVybS5tIGIvc3JjL25zdGVybS5tCmluZGV4IDE5MTljNmRlZmEuLmI5NWQzYjI1ZDkg MTAwNjQ0Ci0tLSBhL3NyYy9uc3Rlcm0ubQorKysgYi9zcmMvbnN0ZXJtLm0KQEAgLTM0ODcsMjMg KzM0ODcsMzcgQEAgTm90ZSB0aGF0IENVUlNPUl9XSURUSCBpcyBtZWFuaW5nZnVsIG9ubHkgZm9y IChoKWJhciBjdXJzb3JzLgogICAgICAgICAgICAgewogCSAgICAgIHN0cnVjdCBmb250ICpmb250 ID0gZm9udF9mb3JfdW5kZXJsaW5lX21ldHJpY3MgKHMpOwogICAgICAgICAgICAgICB1bnNpZ25l ZCBsb25nIGRlc2NlbnQgPSBzLT55ICsgcy0+aGVpZ2h0IC0gcy0+eWJhc2U7CisgICAgICAgICAg ICAgIHVuc2lnbmVkIGxvbmcgbWluaW11bV9vZmZzZXQ7CisgICAgICAgICAgICAgIEJPT0wgdW5k ZXJsaW5lX2F0X2Rlc2NlbnRfbGluZSwgdXNlX3VuZGVybGluZV9wb3NpdGlvbl9wcm9wZXJ0aWVz OworICAgICAgICAgICAgICBMaXNwX09iamVjdCB2YWwgPSBidWZmZXJfbG9jYWxfdmFsdWUgKFF1 bmRlcmxpbmVfbWluaW11bV9vZmZzZXQsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgcy0+dy0+Y29udGVudHMpOworICAgICAgICAgICAgICBpZiAo SU5URUdFUlAgKHZhbCkpCisgICAgICAgICAgICAgICAgbWluaW11bV9vZmZzZXQgPSBYRkFTVElO VCAodmFsKTsKKyAgICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgIG1pbmltdW1fb2Zm c2V0ID0gMTsKKyAgICAgICAgICAgICAgdmFsID0gYnVmZmVyX2xvY2FsX3ZhbHVlIChReF91bmRl cmxpbmVfYXRfZGVzY2VudF9saW5lLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHMtPnctPmNvbnRlbnRzKTsKKyAgICAgICAgICAgICAgdW5kZXJsaW5lX2F0X2Rlc2Nl bnRfbGluZSA9ICEoTklMUCAodmFsKSB8fCBFUSAodmFsLCBRdW5ib3VuZCkpOworICAgICAgICAg ICAgICB2YWwgPSBidWZmZXJfbG9jYWxfdmFsdWUgKFF4X3VzZV91bmRlcmxpbmVfcG9zaXRpb25f cHJvcGVydGllcywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzLT53 LT5jb250ZW50cyk7CisgICAgICAgICAgICAgIHVzZV91bmRlcmxpbmVfcG9zaXRpb25fcHJvcGVy dGllcyA9ICEoTklMUCAodmFsKSB8fCBFUSAodmFsLCBRdW5ib3VuZCkpOwogCiAgICAgICAgICAg ICAgIC8qIFVzZSB1bmRlcmxpbmUgdGhpY2tuZXNzIG9mIGZvbnQsIGRlZmF1bHRpbmcgdG8gMS4g Ki8KICAgICAgICAgICAgICAgdGhpY2tuZXNzID0gKGZvbnQgJiYgZm9udC0+dW5kZXJsaW5lX3Ro aWNrbmVzcyA+IDApCiAgICAgICAgICAgICAgICAgPyBmb250LT51bmRlcmxpbmVfdGhpY2tuZXNz IDogMTsKIAogICAgICAgICAgICAgICAvKiBEZXRlcm1pbmUgdGhlIG9mZnNldCBvZiB1bmRlcmxp bmluZyBmcm9tIHRoZSBiYXNlbGluZS4gKi8KLSAgICAgICAgICAgICAgaWYgKHhfdW5kZXJsaW5l X2F0X2Rlc2NlbnRfbGluZSkKKyAgICAgICAgICAgICAgaWYgKHVuZGVybGluZV9hdF9kZXNjZW50 X2xpbmUpCiAgICAgICAgICAgICAgICAgcG9zaXRpb24gPSBkZXNjZW50IC0gdGhpY2tuZXNzOwot ICAgICAgICAgICAgICBlbHNlIGlmICh4X3VzZV91bmRlcmxpbmVfcG9zaXRpb25fcHJvcGVydGll cworICAgICAgICAgICAgICBlbHNlIGlmICh1c2VfdW5kZXJsaW5lX3Bvc2l0aW9uX3Byb3BlcnRp ZXMKICAgICAgICAgICAgICAgICAgICAgICAgJiYgZm9udCAmJiBmb250LT51bmRlcmxpbmVfcG9z aXRpb24gPj0gMCkKICAgICAgICAgICAgICAgICBwb3NpdGlvbiA9IGZvbnQtPnVuZGVybGluZV9w b3NpdGlvbjsKICAgICAgICAgICAgICAgZWxzZSBpZiAoZm9udCkKICAgICAgICAgICAgICAgICBw b3NpdGlvbiA9IGxyb3VuZCAoZm9udC0+ZGVzY2VudCAvIDIpOwogICAgICAgICAgICAgICBlbHNl Ci0gICAgICAgICAgICAgICAgcG9zaXRpb24gPSB1bmRlcmxpbmVfbWluaW11bV9vZmZzZXQ7Cisg ICAgICAgICAgICAgICAgcG9zaXRpb24gPSBtaW5pbXVtX29mZnNldDsKIAotICAgICAgICAgICAg ICBwb3NpdGlvbiA9IG1heCAocG9zaXRpb24sIHVuZGVybGluZV9taW5pbXVtX29mZnNldCk7Cisg ICAgICAgICAgICAgIHBvc2l0aW9uID0gbWF4IChwb3NpdGlvbiwgbWluaW11bV9vZmZzZXQpOwog CiAgICAgICAgICAgICAgIC8qIEVuc3VyZSB1bmRlcmxpbmluZyBpcyBub3QgY3JvcHBlZC4gKi8K ICAgICAgICAgICAgICAgaWYgKGRlc2NlbnQgPD0gcG9zaXRpb24pCkBAIC05NDY1LDExICs5NDc5 LDEzIEBAIE5pbCBtZWFucyB1c2UgZnVsbHNjcmVlbiB0aGUgb2xkICg8IDEwLjcpIHdheS4gIFRo ZSBvbGQgd2F5IHdvcmtzIGJldHRlciB3aXRoCiAJICAgICAgIHhfdXNlX3VuZGVybGluZV9wb3Np dGlvbl9wcm9wZXJ0aWVzLAogICAgICBkb2M6IC8qIFNLSVA6IHJlYWwgZG9jIGluIHh0ZXJtLmMu ICAqLyk7CiAgIHhfdXNlX3VuZGVybGluZV9wb3NpdGlvbl9wcm9wZXJ0aWVzID0gMDsKKyAgREVG U1lNIChReF91c2VfdW5kZXJsaW5lX3Bvc2l0aW9uX3Byb3BlcnRpZXMsICJ4LXVzZS11bmRlcmxp bmUtcG9zaXRpb24tcHJvcGVydGllcyIpOwogCiAgIERFRlZBUl9CT09MICgieC11bmRlcmxpbmUt YXQtZGVzY2VudC1saW5lIiwKIAkgICAgICAgeF91bmRlcmxpbmVfYXRfZGVzY2VudF9saW5lLAog ICAgICBkb2M6IC8qIFNLSVA6IHJlYWwgZG9jIGluIHh0ZXJtLmMuICAqLyk7CiAgIHhfdW5kZXJs aW5lX2F0X2Rlc2NlbnRfbGluZSA9IDA7CisgIERFRlNZTSAoUXhfdW5kZXJsaW5lX2F0X2Rlc2Nl bnRfbGluZSwgIngtdW5kZXJsaW5lLWF0LWRlc2NlbnQtbGluZSIpOwogCiAgIC8qIFRlbGwgRW1h Y3MgYWJvdXQgdGhpcyB3aW5kb3cgc3lzdGVtLiAgKi8KICAgRnByb3ZpZGUgKFFucywgUW5pbCk7 CmRpZmYgLS1naXQgYS9zcmMvdzMydGVybS5jIGIvc3JjL3czMnRlcm0uYwppbmRleCA5N2FmYjY3 OGMxLi40NzU0MGVmNzJlIDEwMDY0NAotLS0gYS9zcmMvdzMydGVybS5jCisrKyBiL3NyYy93MzJ0 ZXJtLmMKQEAgLTI0NzUsMTMgKzI0NzUsMjggQEAgeF9kcmF3X2dseXBoX3N0cmluZyAoc3RydWN0 IGdseXBoX3N0cmluZyAqcykKICAgICAgICAgICAgICAgZWxzZQogICAgICAgICAgICAgICAgIHsK IAkJICBzdHJ1Y3QgZm9udCAqZm9udCA9IGZvbnRfZm9yX3VuZGVybGluZV9tZXRyaWNzIChzKTsK KyAgICAgICAgICAgICAgICAgIHVuc2lnbmVkIGxvbmcgbWluaW11bV9vZmZzZXQ7CisgICAgICAg ICAgICAgICAgICBCT09MIHVuZGVybGluZV9hdF9kZXNjZW50X2xpbmUsIHVzZV91bmRlcmxpbmVf cG9zaXRpb25fcHJvcGVydGllczsKKyAgICAgICAgICAgICAgICAgIExpc3BfT2JqZWN0IHZhbCA9 IGJ1ZmZlcl9sb2NhbF92YWx1ZSAoUXVuZGVybGluZV9taW5pbXVtX29mZnNldCwKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcy0+dy0+Y29u dGVudHMpOworICAgICAgICAgICAgICAgICAgaWYgKElOVEVHRVJQICh2YWwpKQorICAgICAgICAg ICAgICAgICAgICBtaW5pbXVtX29mZnNldCA9IFhGQVNUSU5UICh2YWwpOworICAgICAgICAgICAg ICAgICAgZWxzZQorICAgICAgICAgICAgICAgICAgICBtaW5pbXVtX29mZnNldCA9IDE7CisgICAg ICAgICAgICAgICAgICB2YWwgPSBidWZmZXJfbG9jYWxfdmFsdWUgKFF4X3VuZGVybGluZV9hdF9k ZXNjZW50X2xpbmUsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IHMtPnctPmNvbnRlbnRzKTsKKyAgICAgICAgICAgICAgICAgIHVuZGVybGluZV9hdF9kZXNjZW50 X2xpbmUgPSAhKE5JTFAgKHZhbCkgfHwgRVEgKHZhbCwgUXVuYm91bmQpKTsKKyAgICAgICAgICAg ICAgICAgIHZhbCA9IGJ1ZmZlcl9sb2NhbF92YWx1ZSAoUXhfdXNlX3VuZGVybGluZV9wb3NpdGlv bl9wcm9wZXJ0aWVzLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBzLT53LT5jb250ZW50cyk7CisgICAgICAgICAgICAgICAgICB1c2VfdW5kZXJsaW5lX3Bvc2l0 aW9uX3Byb3BlcnRpZXMgPSAhKE5JTFAgKHZhbCkgfHwgRVEgKHZhbCwgUXVuYm91bmQpKTsKIAog ICAgICAgICAgICAgICAgICAgLyogR2V0IHRoZSB1bmRlcmxpbmUgdGhpY2tuZXNzLiAgRGVmYXVs dCBpcyAxIHBpeGVsLiAgKi8KICAgICAgICAgICAgICAgICAgIGlmIChmb250ICYmIGZvbnQtPnVu ZGVybGluZV90aGlja25lc3MgPiAwKQogICAgICAgICAgICAgICAgICAgICB0aGlja25lc3MgPSBm b250LT51bmRlcmxpbmVfdGhpY2tuZXNzOwogICAgICAgICAgICAgICAgICAgZWxzZQogICAgICAg ICAgICAgICAgICAgICB0aGlja25lc3MgPSAxOwotICAgICAgICAgICAgICAgICAgaWYgKHhfdW5k ZXJsaW5lX2F0X2Rlc2NlbnRfbGluZSB8fCAhZm9udCkKKyAgICAgICAgICAgICAgICAgIGlmICh1 bmRlcmxpbmVfYXRfZGVzY2VudF9saW5lCisgICAgICAgICAgICAgICAgICAgICAgfHwgIWZvbnQp CiAgICAgICAgICAgICAgICAgICAgIHBvc2l0aW9uID0gKHMtPmhlaWdodCAtIHRoaWNrbmVzcykg LSAocy0+eWJhc2UgLSBzLT55KTsKICAgICAgICAgICAgICAgICAgIGVsc2UKICAgICAgICAgICAg ICAgICAgICAgewpAQCAtMjQ5MywxMyArMjUwOCwxMyBAQCB4X2RyYXdfZ2x5cGhfc3RyaW5nIChz dHJ1Y3QgZ2x5cGhfc3RyaW5nICpzKQogICAgICAgICAgICAgICAgICAgICAgICAgIFJPVU5EICgo bWF4aW11bV9kZXNjZW50KSAvIDIpLCB3aXRoCiAgICAgICAgICAgICAgICAgICAgICAgICAgUk9V TkQgKHgpID0gZmxvb3IgKHggKyAwLjUpICAqLwogCi0gICAgICAgICAgICAgICAgICAgICAgaWYg KHhfdXNlX3VuZGVybGluZV9wb3NpdGlvbl9wcm9wZXJ0aWVzCisgICAgICAgICAgICAgICAgICAg ICAgaWYgKHVzZV91bmRlcmxpbmVfcG9zaXRpb25fcHJvcGVydGllcwogICAgICAgICAgICAgICAg ICAgICAgICAgICAmJiBmb250LT51bmRlcmxpbmVfcG9zaXRpb24gPj0gMCkKICAgICAgICAgICAg ICAgICAgICAgICAgIHBvc2l0aW9uID0gZm9udC0+dW5kZXJsaW5lX3Bvc2l0aW9uOwogICAgICAg ICAgICAgICAgICAgICAgIGVsc2UKICAgICAgICAgICAgICAgICAgICAgICAgIHBvc2l0aW9uID0g KGZvbnQtPmRlc2NlbnQgKyAxKSAvIDI7CiAgICAgICAgICAgICAgICAgICAgIH0KLSAgICAgICAg ICAgICAgICAgIHBvc2l0aW9uID0gbWF4IChwb3NpdGlvbiwgdW5kZXJsaW5lX21pbmltdW1fb2Zm c2V0KTsKKyAgICAgICAgICAgICAgICAgIHBvc2l0aW9uID0gbWF4IChwb3NpdGlvbiwgbWluaW11 bV9vZmZzZXQpOwogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgLyogQ2hlY2sgdGhl IHNhbml0eSBvZiB0aGlja25lc3MgYW5kIHBvc2l0aW9uLiAgV2Ugc2hvdWxkCiAgICAgICAgICAg ICAgICAgIGF2b2lkIGRyYXdpbmcgdW5kZXJsaW5lIG91dCBvZiB0aGUgY3VycmVudCBsaW5lIGFy ZWEuICAqLwpAQCAtNzM4NSwxMSArNzQwMCwxMyBAQCB0aGUgY3Vyc29yIGhhdmUgbm8gZWZmZWN0 LiAgKi8pOwogCSAgICAgICB4X3VzZV91bmRlcmxpbmVfcG9zaXRpb25fcHJvcGVydGllcywKICAg ICAgZG9jOiAvKiBTS0lQOiByZWFsIGRvYyBpbiB4dGVybS5jLiAgKi8pOwogICB4X3VzZV91bmRl cmxpbmVfcG9zaXRpb25fcHJvcGVydGllcyA9IDA7CisgIERFRlNZTSAoUXhfdXNlX3VuZGVybGlu ZV9wb3NpdGlvbl9wcm9wZXJ0aWVzLCAieC11c2UtdW5kZXJsaW5lLXBvc2l0aW9uLXByb3BlcnRp ZXMiKTsKIAogICBERUZWQVJfQk9PTCAoIngtdW5kZXJsaW5lLWF0LWRlc2NlbnQtbGluZSIsCiAJ ICAgICAgIHhfdW5kZXJsaW5lX2F0X2Rlc2NlbnRfbGluZSwKICAgICAgZG9jOiAvKiBTS0lQOiBy ZWFsIGRvYyBpbiB4dGVybS5jLiAgKi8pOwogICB4X3VuZGVybGluZV9hdF9kZXNjZW50X2xpbmUg PSAwOworICBERUZTWU0gKFF4X3VuZGVybGluZV9hdF9kZXNjZW50X2xpbmUsICJ4LXVuZGVybGlu ZS1hdC1kZXNjZW50LWxpbmUiKTsKIAogICBERUZWQVJfTElTUCAoIngtdG9vbGtpdC1zY3JvbGwt YmFycyIsIFZ4X3Rvb2xraXRfc2Nyb2xsX2JhcnMsCiAJICAgICAgIGRvYzogLyogU0tJUDogcmVh bCBkb2MgaW4geHRlcm0uYy4gICovKTsKZGlmZiAtLWdpdCBhL3NyYy94ZGlzcC5jIGIvc3JjL3hk aXNwLmMKaW5kZXggOTE3MGQ2Yjc3Ny4uMTNmMjgxZThlYSAxMDA2NDQKLS0tIGEvc3JjL3hkaXNw LmMKKysrIGIvc3JjL3hkaXNwLmMKQEAgLTMyOTc4LDYgKzMyOTc4LDcgQEAgcGFydGljdWxhcmx5 IHdoZW4gdXNpbmcgdmFyaWFibGUgYHgtdXNlLXVuZGVybGluZS1wb3NpdGlvbi1wcm9wZXJ0aWVz Jwogd2l0aCBmb250cyB0aGF0IHNwZWNpZnkgYW4gVU5ERVJMSU5FX1BPU0lUSU9OIHJlbGF0aXZl bHkgY2xvc2UgdG8gdGhlCiBiYXNlbGluZS4gIFRoZSBkZWZhdWx0IHZhbHVlIGlzIDEuICAqLyk7 CiAgIHVuZGVybGluZV9taW5pbXVtX29mZnNldCA9IDE7CisgIERFRlNZTSAoUXVuZGVybGluZV9t aW5pbXVtX29mZnNldCwgInVuZGVybGluZS1taW5pbXVtLW9mZnNldCIpOwogCiAgIERFRlZBUl9C T09MICgiZGlzcGxheS1ob3VyZ2xhc3MiLCBkaXNwbGF5X2hvdXJnbGFzc19wLAogCSAgICAgICBk b2M6IC8qIE5vbi1uaWwgbWVhbnMgc2hvdyBhbiBob3VyZ2xhc3MgcG9pbnRlciwgd2hlbiBFbWFj cyBpcyBidXN5LgpkaWZmIC0tZ2l0IGEvc3JjL3h0ZXJtLmMgYi9zcmMveHRlcm0uYwppbmRleCAw ZDI1YzdmMWEyLi4wMmY5ZTI1YzIzIDEwMDY0NAotLS0gYS9zcmMveHRlcm0uYworKysgYi9zcmMv eHRlcm0uYwpAQCAtMzcwNywxMyArMzcwNywyNyBAQCB4X2RyYXdfZ2x5cGhfc3RyaW5nIChzdHJ1 Y3QgZ2x5cGhfc3RyaW5nICpzKQogICAgICAgICAgICAgICBlbHNlCiAgICAgICAgICAgICAgICAg ewogCQkgIHN0cnVjdCBmb250ICpmb250ID0gZm9udF9mb3JfdW5kZXJsaW5lX21ldHJpY3MgKHMp OworICAgICAgICAgICAgICAgICAgdW5zaWduZWQgbG9uZyBtaW5pbXVtX29mZnNldDsKKyAgICAg ICAgICAgICAgICAgIEJPT0wgdW5kZXJsaW5lX2F0X2Rlc2NlbnRfbGluZSwgdXNlX3VuZGVybGlu ZV9wb3NpdGlvbl9wcm9wZXJ0aWVzOworICAgICAgICAgICAgICAgICAgTGlzcF9PYmplY3QgdmFs ID0gYnVmZmVyX2xvY2FsX3ZhbHVlIChRdW5kZXJsaW5lX21pbmltdW1fb2Zmc2V0LAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzLT53LT5j b250ZW50cyk7CisgICAgICAgICAgICAgICAgICBpZiAoSU5URUdFUlAgKHZhbCkpCisgICAgICAg ICAgICAgICAgICAgIG1pbmltdW1fb2Zmc2V0ID0gWEZBU1RJTlQgKHZhbCk7CisgICAgICAgICAg ICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgICAgIG1pbmltdW1fb2Zmc2V0ID0gMTsKKyAg ICAgICAgICAgICAgICAgIHZhbCA9IGJ1ZmZlcl9sb2NhbF92YWx1ZSAoUXhfdW5kZXJsaW5lX2F0 X2Rlc2NlbnRfbGluZSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgcy0+dy0+Y29udGVudHMpOworICAgICAgICAgICAgICAgICAgdW5kZXJsaW5lX2F0X2Rlc2Nl bnRfbGluZSA9ICEoTklMUCAodmFsKSB8fCBFUSAodmFsLCBRdW5ib3VuZCkpOworICAgICAgICAg ICAgICAgICAgdmFsID0gYnVmZmVyX2xvY2FsX3ZhbHVlIChReF91c2VfdW5kZXJsaW5lX3Bvc2l0 aW9uX3Byb3BlcnRpZXMsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHMtPnctPmNvbnRlbnRzKTsKKyAgICAgICAgICAgICAgICAgIHVzZV91bmRlcmxpbmVfcG9z aXRpb25fcHJvcGVydGllcyA9ICEoTklMUCAodmFsKSB8fCBFUSAodmFsLCBRdW5ib3VuZCkpOwog CiAgICAgICAgICAgICAgICAgICAvKiBHZXQgdGhlIHVuZGVybGluZSB0aGlja25lc3MuICBEZWZh dWx0IGlzIDEgcGl4ZWwuICAqLwogICAgICAgICAgICAgICAgICAgaWYgKGZvbnQgJiYgZm9udC0+ dW5kZXJsaW5lX3RoaWNrbmVzcyA+IDApCiAgICAgICAgICAgICAgICAgICAgIHRoaWNrbmVzcyA9 IGZvbnQtPnVuZGVybGluZV90aGlja25lc3M7CiAgICAgICAgICAgICAgICAgICBlbHNlCiAgICAg ICAgICAgICAgICAgICAgIHRoaWNrbmVzcyA9IDE7Ci0gICAgICAgICAgICAgICAgICBpZiAoeF91 bmRlcmxpbmVfYXRfZGVzY2VudF9saW5lKQorICAgICAgICAgICAgICAgICAgaWYgKHVuZGVybGlu ZV9hdF9kZXNjZW50X2xpbmUpCiAgICAgICAgICAgICAgICAgICAgIHBvc2l0aW9uID0gKHMtPmhl aWdodCAtIHRoaWNrbmVzcykgLSAocy0+eWJhc2UgLSBzLT55KTsKICAgICAgICAgICAgICAgICAg IGVsc2UKICAgICAgICAgICAgICAgICAgICAgewpAQCAtMzcyNSwxNSArMzczOSwxNSBAQCB4X2Ry YXdfZ2x5cGhfc3RyaW5nIChzdHJ1Y3QgZ2x5cGhfc3RyaW5nICpzKQogICAgICAgICAgICAgICAg ICAgICAgICAgIFJPVU5EICgobWF4aW11bSBkZXNjZW50KSAvIDIpLCB3aXRoCiAgICAgICAgICAg ICAgICAgICAgICAgICAgUk9VTkQoeCkgPSBmbG9vciAoeCArIDAuNSkgICovCiAKLSAgICAgICAg ICAgICAgICAgICAgICBpZiAoeF91c2VfdW5kZXJsaW5lX3Bvc2l0aW9uX3Byb3BlcnRpZXMKKyAg ICAgICAgICAgICAgICAgICAgICBpZiAodXNlX3VuZGVybGluZV9wb3NpdGlvbl9wcm9wZXJ0aWVz CiAgICAgICAgICAgICAgICAgICAgICAgICAgICYmIGZvbnQgJiYgZm9udC0+dW5kZXJsaW5lX3Bv c2l0aW9uID49IDApCiAgICAgICAgICAgICAgICAgICAgICAgICBwb3NpdGlvbiA9IGZvbnQtPnVu ZGVybGluZV9wb3NpdGlvbjsKICAgICAgICAgICAgICAgICAgICAgICBlbHNlIGlmIChmb250KQog ICAgICAgICAgICAgICAgICAgICAgICAgcG9zaXRpb24gPSAoZm9udC0+ZGVzY2VudCArIDEpIC8g MjsKICAgICAgICAgICAgICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAgICAgICAgICAgICBw b3NpdGlvbiA9IHVuZGVybGluZV9taW5pbXVtX29mZnNldDsKKyAgICAgICAgICAgICAgICAgICAg ICAgIHBvc2l0aW9uID0gbWluaW11bV9vZmZzZXQ7CiAgICAgICAgICAgICAgICAgICAgIH0KLSAg ICAgICAgICAgICAgICAgIHBvc2l0aW9uID0gbWF4IChwb3NpdGlvbiwgdW5kZXJsaW5lX21pbmlt dW1fb2Zmc2V0KTsKKyAgICAgICAgICAgICAgICAgIHBvc2l0aW9uID0gbWF4IChwb3NpdGlvbiwg bWluaW11bV9vZmZzZXQpOwogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgLyogQ2hl Y2sgdGhlIHNhbml0eSBvZiB0aGlja25lc3MgYW5kIHBvc2l0aW9uLiAgV2Ugc2hvdWxkCiAgICAg ICAgICAgICAgICAgIGF2b2lkIGRyYXdpbmcgdW5kZXJsaW5lIG91dCBvZiB0aGUgY3VycmVudCBs aW5lIGFyZWEuICAqLwpAQCAtMTMyNDYsNiArMTMyNjAsNyBAQCBVTkRFUkxJTkVfUE9TSVRJT04g Zm9udCBwcm9wZXJ0aWVzLCBzZXQgdGhpcyB0byBuaWwuICBZb3UgY2FuIGFsc28gdXNlCiBgdW5k ZXJsaW5lLW1pbmltdW0tb2Zmc2V0JyB0byBvdmVycmlkZSB0aGUgZm9udCdzIFVOREVSTElORV9Q T1NJVElPTiBmb3IKIHNtYWxsIGZvbnQgZGlzcGxheSBzaXplcy4gICovKTsKICAgeF91c2VfdW5k ZXJsaW5lX3Bvc2l0aW9uX3Byb3BlcnRpZXMgPSB0cnVlOworICBERUZTWU0gKFF4X3VzZV91bmRl cmxpbmVfcG9zaXRpb25fcHJvcGVydGllcywgIngtdXNlLXVuZGVybGluZS1wb3NpdGlvbi1wcm9w ZXJ0aWVzIik7CiAKICAgREVGVkFSX0JPT0wgKCJ4LXVuZGVybGluZS1hdC1kZXNjZW50LWxpbmUi LAogCSAgICAgICB4X3VuZGVybGluZV9hdF9kZXNjZW50X2xpbmUsCkBAIC0xMzI1Niw2ICsxMzI3 MSw3IEBAIEEgdmFsdWUgb2YgbmlsIG1lYW5zIHRvIGRyYXcgdGhlIHVuZGVybGluZSBhY2NvcmRp bmcgdG8gdGhlIHZhbHVlIG9mIHRoZQogdmFyaWFibGUgYHgtdXNlLXVuZGVybGluZS1wb3NpdGlv bi1wcm9wZXJ0aWVzJywgd2hpY2ggaXMgdXN1YWxseSBhdCB0aGUKIGJhc2VsaW5lIGxldmVsLiAg VGhlIGRlZmF1bHQgdmFsdWUgaXMgbmlsLiAgKi8pOwogICB4X3VuZGVybGluZV9hdF9kZXNjZW50 X2xpbmUgPSBmYWxzZTsKKyAgREVGU1lNIChReF91bmRlcmxpbmVfYXRfZGVzY2VudF9saW5lLCAi eC11bmRlcmxpbmUtYXQtZGVzY2VudC1saW5lIik7CiAKICAgREVGVkFSX0JPT0wgKCJ4LW1vdXNl LWNsaWNrLWZvY3VzLWlnbm9yZS1wb3NpdGlvbiIsCiAJICAgICAgIHhfbW91c2VfY2xpY2tfZm9j dXNfaWdub3JlX3Bvc2l0aW9uLAotLSAKMi4xNS4xCgo= --94eb2c0b29f69ef67a056655c247--