From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Jared Finder via "Emacs development discussions." Newsgroups: gmane.emacs.devel Subject: Re: mouse-face and help echo support for xterm mouse Date: Thu, 05 Nov 2020 22:46:32 -0800 Message-ID: References: <946d9ea094642758037d1881a97e8d0c@finder.org> <6e5a5cde54359702c36d1371861f30c3@finder.org> <831rh79g97.fsf@gnu.org> Reply-To: Jared Finder Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=_5899305b7c7449f2540e5ee733b7f3ab" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="8685"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Roundcube Webmail/1.3.15 Cc: monnier@iro.umontreal.ca, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Fri Nov 06 07:47:21 2020 Return-path: Envelope-to: ged-emacs-devel@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 1kavWq-00027a-U2 for ged-emacs-devel@m.gmane-mx.org; Fri, 06 Nov 2020 07:47:21 +0100 Original-Received: from localhost ([::1]:46734 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kavWp-0004eJ-UK for ged-emacs-devel@m.gmane-mx.org; Fri, 06 Nov 2020 01:47:19 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:58644) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kavW9-0004Do-Nc for emacs-devel@gnu.org; Fri, 06 Nov 2020 01:46:37 -0500 Original-Received: from greenhill.hpalace.com ([2600:3c01::f03c:91ff:fe73:2daa]:58788) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kavW7-0002hm-7V; Fri, 06 Nov 2020 01:46:37 -0500 Original-Received: from mail.finder.org (greenhill.hpalace.com [IPv6:2600:3c01::f03c:91ff:fe73:2daa]) by greenhill.hpalace.com (Postfix) with ESMTPSA id A2C2ABB5; Fri, 6 Nov 2020 06:46:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=finder.org; s=2018; t=1604645192; bh=HWOhH8nvXftL777juCRf9EMP2OGlqT/zP95C9ZDUeIg=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=SGd1XS/jR6eEOYhRZuUVibwi7jNKxpUKxCurizPLsG5H/aKifJnqTnLNU+yyfW9wU 7e5pht5CuL+RSita6kWOJkHuclQpBeE1Yc5ERiLwj0k4MrvqCkBqbKuocRZLWUAXxg by52b2Wj++MaFFnWuTNrfhvHr8ovEceSg0UP/uZ331wPeabsV8zoIGUaxgp1iEVLid zUdyy2WfVnUh5M+7ESLpXrDtsJzLcEFO/MRKH/30AaDDbQLBHXjfXT8oeJD479dZGb ywWd1DGVwYwQKGeq6ECIkImTx3qFrahYNsfw3/lfLJX5TYX9dV5LmgCnZMHtCoKQp9 SJParQQy4ie9w== In-Reply-To: <831rh79g97.fsf@gnu.org> X-Sender: jared@finder.org Received-SPF: pass client-ip=2600:3c01::f03c:91ff:fe73:2daa; envelope-from=jared@finder.org; helo=greenhill.hpalace.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:258777 Archived-At: --=_5899305b7c7449f2540e5ee733b7f3ab Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII; format=flowed On 2020-11-05 10:00 pm, Eli Zaretskii wrote: >> Date: Thu, 05 Nov 2020 21:23:26 -0800 >> Cc: "Jared Finder via \"Emacs development discussions.\"" >> >> From: Jared Finder via "Emacs development discussions." >> >> >> All points addressed. New patch attached. > > Thanks. > >> * src/dispnew.c (update_mouse_position): New function for mouse >> movement >> logic in 'handle_one_term_event' that can be shared across different >> mouse backends. >> (display--update-for-mouse-movement): New lisp function, call it. >> * lisp/xt-mouse.el (xterm-mouse--handle-mouse-movement): New function >> that >> calls 'display--update-for-mouse-movement'. >> (xterm-mouse-translate-1): Call it. >> * src/term.c (handle_one_term_event): Inline logic from >> 'term_mouse_movement' and call 'update_mouse_position'. >> (term_mouse_movement): Delete. > > Nitpicking: the lines in the change log are too long, they will > overflow 80 columns when indented by TABs (which happens when we > generate a ChangeLog file from Git log). Please use one of the Emacs > commands available for generating ChangeLog entries, they will keep > you from making these mistakes. Oops, sorry. I hand-verified each row was 72 or less characters just now. I will try to learn the Emacs commands for dealing with changelogs. >> + XSETFRAME(frame, f); > ^ > Please leave a space before the opening parenthesis, to conform to our > coding conventsions. Done. >> + update_mouse_position (XFRAME (selected_frame), XFIXNUM (mouse_x), > ^^^^^^^^^^^^^^^^^^^^^^^ > A.k.a. SELECTED_FRAME(). Done. >> (defface mode-line-highlight >> - '((((class color) (min-colors 88)) >> + '((((type graphic) (class color) (min-colors 88)) >> :box (:line-width 2 :color "grey40" :style released-button)) > > I don't think I understand the rationale. With TTYs supporting many > colors nowadays, and mode-line-highlight available on TTYs, what is > the problem you tried to fix here? Are there any TTYs that support :box? None of the platforms I tested locally on do, they instead just ignore the :box aspect of any face. Updated patches attached. -- MJF --=_5899305b7c7449f2540e5ee733b7f3ab Content-Transfer-Encoding: base64 Content-Type: text/x-diff; name=0001-Face-changing-text-properties-and-help-echo-now-work.patch Content-Disposition: attachment; filename=0001-Face-changing-text-properties-and-help-echo-now-work.patch; size=6987 RnJvbSAwMzljMzk5YTUwNzhhOWU5NWQ5ZjQ5Y2I4YjVhOWE5NDE0OTRiZjU3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKYXJlZCBGaW5kZXIgPGphcmVkQGZpbmRlci5vcmc+CkRhdGU6 IFNhdCwgMzEgT2N0IDIwMjAgMjE6MjU6NDcgLTA4MDAKU3ViamVjdDogW1BBVENIIDEvMl0gRmFj ZS1jaGFuZ2luZyB0ZXh0IHByb3BlcnRpZXMgYW5kIGhlbHAtZWNobyBub3cgd29yayB3aXRoCiB4 dGVybS1tb3VzZS4KCiogc3JjL2Rpc3BuZXcuYyAodXBkYXRlX21vdXNlX3Bvc2l0aW9uKTogTmV3 IGZ1bmN0aW9uIGZvciBtb3VzZQptb3ZlbWVudCBsb2dpYyBpbiAnaGFuZGxlX29uZV90ZXJtX2V2 ZW50JyB0aGF0IGNhbiBiZSBzaGFyZWQgYWNyb3NzCmRpZmZlcmVudCBtb3VzZSBiYWNrZW5kcy4K KGRpc3BsYXktLXVwZGF0ZS1mb3ItbW91c2UtbW92ZW1lbnQpOiBOZXcgbGlzcCBmdW5jdGlvbiwg Y2FsbCBpdC4KKiBsaXNwL3h0LW1vdXNlLmVsICh4dGVybS1tb3VzZS0taGFuZGxlLW1vdXNlLW1v dmVtZW50KTogTmV3IGZ1bmN0aW9uCnRoYXQgY2FsbHMgJ2Rpc3BsYXktLXVwZGF0ZS1mb3ItbW91 c2UtbW92ZW1lbnQnLgooeHRlcm0tbW91c2UtdHJhbnNsYXRlLTEpOiBDYWxsIGl0LgoqIHNyYy90 ZXJtLmMgKGhhbmRsZV9vbmVfdGVybV9ldmVudCk6IElubGluZSBsb2dpYyBmcm9tCid0ZXJtX21v dXNlX21vdmVtZW50JyBhbmQgY2FsbCAndXBkYXRlX21vdXNlX3Bvc2l0aW9uJy4KKHRlcm1fbW91 c2VfbW92ZW1lbnQpOiBEZWxldGUuCi0tLQogbGlzcC94dC1tb3VzZS5lbCB8ICA3ICsrKysrKysK IHNyYy9kaXNwZXh0ZXJuLmggfCAgMSArCiBzcmMvZGlzcG5ldy5jICAgIHwgNDggKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysKIHNyYy90ZXJtLmMgICAgICAgfCA1 MiArKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDQgZmls ZXMgY2hhbmdlZCwgNzAgaW5zZXJ0aW9ucygrKSwgMzggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvbGlzcC94dC1tb3VzZS5lbCBiL2xpc3AveHQtbW91c2UuZWwKaW5kZXggZjljMDhmOWExNy4u OTMwMTQ3NmU4MSAxMDA2NDQKLS0tIGEvbGlzcC94dC1tb3VzZS5lbAorKysgYi9saXNwL3h0LW1v dXNlLmVsCkBAIC03Nyw2ICs3Nyw3IEBAIHh0ZXJtLW1vdXNlLXRyYW5zbGF0ZS0xCiAgICAgICAg ICAgICAgIChjb3B5LXNlcXVlbmNlIGV2ZW50KSkKIAl2ZWMpCiAgICAgICAgKGlzLW1vdmUKKyAg ICAgICAgKHh0ZXJtLW1vdXNlLS1oYW5kbGUtbW91c2UtbW92ZW1lbnQpCiAgICAgICAgIChpZiB0 cmFjay1tb3VzZSB2ZWMKICAgICAgICAgICA7OyBNb3VzZSBtb3ZlbWVudCBldmVudHMgYXJlIGN1 cnJlbnRseSBzdXBwb3NlZCB0byBiZQogICAgICAgICAgIDs7IHN1cHByZXNzZWQuICBSZXR1cm4g bm8gZXZlbnQuCkBAIC0xMDYsOCArMTA3LDE0IEBAIHh0ZXJtLW1vdXNlLXRyYW5zbGF0ZS0xCiAJ ICAgICAgKGlmIChudWxsIHRyYWNrLW1vdXNlKQogCQkgICh2ZWN0b3IgZHJhZykKIAkJKHB1c2gg ZHJhZyB1bnJlYWQtY29tbWFuZC1ldmVudHMpCisgICAgICAgICAgICAgICAgKHh0ZXJtLW1vdXNl LS1oYW5kbGUtbW91c2UtbW92ZW1lbnQpCiAJCSh2ZWN0b3IgKGxpc3QgJ21vdXNlLW1vdmVtZW50 IGV2LWRhdGEpKSkpKSkpKSkpKSkKIAorKGRlZnVuIHh0ZXJtLW1vdXNlLS1oYW5kbGUtbW91c2Ut bW92ZW1lbnQgKCkKKyAgIkhhbmRsZSBtb3VzZSBtb3Rpb24gdGhhdCB3YXMganVzdCBnZW5lcmF0 ZWQgZm9yIFhUZXJtIG1vdXNlLiIKKyAgKGRpc3BsYXktLXVwZGF0ZS1mb3ItbW91c2UtbW92ZW1l bnQgKHRlcm1pbmFsLXBhcmFtZXRlciBuaWwgJ3h0ZXJtLW1vdXNlLXgpCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICh0ZXJtaW5hbC1wYXJhbWV0ZXIgbmlsICd4dGVybS1t b3VzZS15KSkpCisKIDs7IFRoZXNlIHR3byB2YXJpYWJsZXMgaGF2ZSBiZWVuIGNvbnZlcnRlZCB0 byB0ZXJtaW5hbCBwYXJhbWV0ZXJzLgogOzsKIDs7KGRlZnZhciB4dGVybS1tb3VzZS14IDAKZGlm ZiAtLWdpdCBhL3NyYy9kaXNwZXh0ZXJuLmggYi9zcmMvZGlzcGV4dGVybi5oCmluZGV4IDg0OGQz YmNkMjAuLmRhNTE3NzJiMzcgMTAwNjQ0Ci0tLSBhL3NyYy9kaXNwZXh0ZXJuLmgKKysrIGIvc3Jj L2Rpc3BleHRlcm4uaApAQCAtMzYwNiw2ICszNjA2LDcgQEAgI2RlZmluZSBJTUFHRV9CQUNLR1JP VU5EX1RSQU5TUEFSRU5UKGltZywgZiwgbWFzaykJCQkgICAgICBcCiBleHRlcm4gdm9pZCByZWRy YXdfZnJhbWUgKHN0cnVjdCBmcmFtZSAqKTsKIGV4dGVybiBib29sIHVwZGF0ZV9mcmFtZSAoc3Ry dWN0IGZyYW1lICosIGJvb2wsIGJvb2wpOwogZXh0ZXJuIHZvaWQgdXBkYXRlX2ZyYW1lX3dpdGhf bWVudSAoc3RydWN0IGZyYW1lICosIGludCwgaW50KTsKK2V4dGVybiBpbnQgdXBkYXRlX21vdXNl X3Bvc2l0aW9uIChzdHJ1Y3QgZnJhbWUgKiwgaW50LCBpbnQpOwogZXh0ZXJuIHZvaWQgYml0Y2hf YXRfdXNlciAodm9pZCk7CiBleHRlcm4gdm9pZCBhZGp1c3RfZnJhbWVfZ2x5cGhzIChzdHJ1Y3Qg ZnJhbWUgKik7CiB2b2lkIGZyZWVfZ2x5cGhzIChzdHJ1Y3QgZnJhbWUgKik7CmRpZmYgLS1naXQg YS9zcmMvZGlzcG5ldy5jIGIvc3JjL2Rpc3BuZXcuYwppbmRleCAzZjJhZTNlNmFkLi4yZTQwZDQ1 OGQxIDEwMDY0NAotLS0gYS9zcmMvZGlzcG5ldy5jCisrKyBiL3NyYy9kaXNwbmV3LmMKQEAgLTMz MjMsNiArMzMyMyw1MyBAQCB1cGRhdGVfZnJhbWVfd2l0aF9tZW51IChzdHJ1Y3QgZnJhbWUgKmYs IGludCByb3csIGludCBjb2wpCiAgIGRpc3BsYXlfY29tcGxldGVkID0gIXBhdXNlZF9wOwogfQog CisvKiBVcGRhdGUgdGhlIG1vdXNlIHBvc2l0aW9uIGZvciBhIGZyYW1lIEYuICBUaGlzIGhhbmRs ZXMgYm90aAorICAgdXBkYXRpbmcgdGhlIGRpc3BsYXkgZm9yIG1vdXNlLWZhY2UgcHJvcHJldGll cyBhbmQgdXBkYXRpbmcgdGhlCisgICBoZWxwIGVjaG8gdGV4dC4KKworICAgUmV0dXJucyB0aGUg bnVtYmVyIG9mIGV2ZW50cyBnZW5lcmF0ZWQuICAqLworaW50Cit1cGRhdGVfbW91c2VfcG9zaXRp b24gKHN0cnVjdCBmcmFtZSAqZiwgaW50IHgsIGludCB5KQoreworICBwcmV2aW91c19oZWxwX2Vj aG9fc3RyaW5nID0gaGVscF9lY2hvX3N0cmluZzsKKyAgaGVscF9lY2hvX3N0cmluZyA9IFFuaWw7 CisKKyAgbm90ZV9tb3VzZV9oaWdobGlnaHQgKGYsIHgsIHkpOworCisgIC8qIElmIHRoZSBjb250 ZW50cyBvZiB0aGUgZ2xvYmFsIHZhcmlhYmxlIGhlbHBfZWNob19zdHJpbmcKKyAgICAgaGFzIGNo YW5nZWQsIGdlbmVyYXRlIGEgSEVMUF9FVkVOVC4gICovCisgIGlmICghTklMUCAoaGVscF9lY2hv X3N0cmluZykKKyAgICAgIHx8ICFOSUxQIChwcmV2aW91c19oZWxwX2VjaG9fc3RyaW5nKSkKKyAg ICB7CisgICAgICBMaXNwX09iamVjdCBmcmFtZTsKKyAgICAgIFhTRVRGUkFNRSAoZnJhbWUsIGYp OworCisgICAgICBnZW5faGVscF9ldmVudCAoaGVscF9lY2hvX3N0cmluZywgZnJhbWUsIGhlbHBf ZWNob193aW5kb3csCisgICAgICAgICAgICAgICAgICAgICAgaGVscF9lY2hvX29iamVjdCwgaGVs cF9lY2hvX3Bvcyk7CisgICAgICByZXR1cm4gMTsKKyAgICB9CisKKyAgcmV0dXJuIDA7Cit9CisK K0RFRlVOICgiZGlzcGxheS0tdXBkYXRlLWZvci1tb3VzZS1tb3ZlbWVudCIsIEZkaXNwbGF5X191 cGRhdGVfZm9yX21vdXNlX21vdmVtZW50LAorICAgICAgIFNkaXNwbGF5X191cGRhdGVfZm9yX21v dXNlX21vdmVtZW50LCAyLCAyLCAwLAorICAgICAgIGRvYzogLyogSGFuZGxlIG1vdXNlIG1vdmVt ZW50IGRldGVjdGVkIGJ5IExpc3AgY29kZS4KKworVGhpcyBmdW5jdGlvbiBzaG91bGQgYmUgY2Fs bGVkIHdoZW4gTGlzcCBjb2RlIGRldGVjdHMgdGhlIG1vdXNlIGhhcworbW92ZWQsIGV2ZW4gaWYg YHRyYWNrLW1vdXNlJyBpcyBuaWwuICBUaGlzIGhhbmRsZXMgdXBkYXRlcyB0aGF0IGRvIG5vdAor cmVseSBvbiBpbnB1dCBldmVudHMgc3VjaCBhcyB1cGRhdGluZyBkaXNwbGF5IGZvciBtb3VzZS1m YWNlCitwcm9wZXJ0aWVzIG9yIHVwZGF0aW5nIHRoZSBoZWxwIGVjaG8gdGV4dC4gICovKQorICAo TGlzcF9PYmplY3QgbW91c2VfeCwgTGlzcF9PYmplY3QgbW91c2VfeSkKK3sKKyAgQ0hFQ0tfRklY TlVNIChtb3VzZV94KTsKKyAgQ0hFQ0tfRklYTlVNIChtb3VzZV95KTsKKworICB1cGRhdGVfbW91 c2VfcG9zaXRpb24gKFNFTEVDVEVEX0ZSQU1FICgpLCBYRklYTlVNIChtb3VzZV94KSwKKyAgICAg ICAgICAgICAgICAgICAgICAgICBYRklYTlVNIChtb3VzZV95KSk7CisgIHJldHVybiBRbmlsOwor fQorCiAMCiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqCiAJCQkgV2luZG93LWJhc2VkIHVwZGF0ZXMKQEAgLTY0 OTAsNiArNjUzNyw3IEBAIHN5bXNfb2ZfZGlzcGxheSAodm9pZCkKIHsKICAgZGVmc3ViciAoJlNy ZWRyYXdfZnJhbWUpOwogICBkZWZzdWJyICgmU3JlZHJhd19kaXNwbGF5KTsKKyAgZGVmc3ViciAo JlNkaXNwbGF5X191cGRhdGVfZm9yX21vdXNlX21vdmVtZW50KTsKICAgZGVmc3ViciAoJlNmcmFt ZV9vcl9idWZmZXJfY2hhbmdlZF9wKTsKICAgZGVmc3ViciAoJlNvcGVuX3Rlcm1zY3JpcHQpOwog ICBkZWZzdWJyICgmU2RpbmcpOwpkaWZmIC0tZ2l0IGEvc3JjL3Rlcm0uYyBiL3NyYy90ZXJtLmMK aW5kZXggM2ExM2RhMTY1ZS4uYTA3Mzg1OTRiZiAxMDA2NDQKLS0tIGEvc3JjL3Rlcm0uYworKysg Yi9zcmMvdGVybS5jCkBAIC0yNDMwLDIyICsyNDMwLDYgQEAgdHR5X2RyYXdfcm93X3dpdGhfbW91 c2VfZmFjZSAoc3RydWN0IHdpbmRvdyAqdywgc3RydWN0IGdseXBoX3JvdyAqcm93LAogICBjdXJz b3JfdG8gKGYsIHNhdmVfeSwgc2F2ZV94KTsKIH0KIAotc3RhdGljIGJvb2wKLXRlcm1fbW91c2Vf bW92ZW1lbnQgKHN0cnVjdCBmcmFtZSAqZnJhbWUsIEdwbV9FdmVudCAqZXZlbnQpCi17Ci0gIC8q IEhhcyB0aGUgbW91c2UgbW92ZWQgb2ZmIHRoZSBnbHlwaCBpdCB3YXMgb24gYXQgdGhlIGxhc3Qg c2lnaHRpbmc/ICAqLwotICBpZiAoZXZlbnQtPnggIT0gbGFzdF9tb3VzZV94IHx8IGV2ZW50LT55 ICE9IGxhc3RfbW91c2VfeSkKLSAgICB7Ci0gICAgICBmcmFtZS0+bW91c2VfbW92ZWQgPSAxOwot ICAgICAgbm90ZV9tb3VzZV9oaWdobGlnaHQgKGZyYW1lLCBldmVudC0+eCwgZXZlbnQtPnkpOwot ICAgICAgLyogUmVtZW1iZXIgd2hpY2ggZ2x5cGggd2UncmUgbm93IG9uLiAgKi8KLSAgICAgIGxh c3RfbW91c2VfeCA9IGV2ZW50LT54OwotICAgICAgbGFzdF9tb3VzZV95ID0gZXZlbnQtPnk7Ci0g ICAgICByZXR1cm4gMTsKLSAgICB9Ci0gIHJldHVybiAwOwotfQotCiAvKiBSZXR1cm4gdGhlIGN1 cnJlbnQgdGltZSwgYXMgYSBUaW1lIHZhbHVlLiAgV3JhcCBhcm91bmQgb24gb3ZlcmZsb3cuICAq Lwogc3RhdGljIFRpbWUKIGN1cnJlbnRfVGltZSAodm9pZCkKQEAgLTI1NjIsMzAgKzI1NDYsMjIg QEAgaGFuZGxlX29uZV90ZXJtX2V2ZW50IChzdHJ1Y3QgdHR5X2Rpc3BsYXlfaW5mbyAqdHR5LCBH cG1fRXZlbnQgKmV2ZW50KQogCiAgIGlmIChldmVudC0+dHlwZSAmIChHUE1fTU9WRSB8IEdQTV9E UkFHKSkKICAgICB7Ci0gICAgICBwcmV2aW91c19oZWxwX2VjaG9fc3RyaW5nID0gaGVscF9lY2hv X3N0cmluZzsKLSAgICAgIGhlbHBfZWNob19zdHJpbmcgPSBRbmlsOwotCiAgICAgICBHcG1fRHJh d1BvaW50ZXIgKGV2ZW50LT54LCBldmVudC0+eSwgZmlsZW5vICh0dHktPm91dHB1dCkpOwogCi0g ICAgICBpZiAoIXRlcm1fbW91c2VfbW92ZW1lbnQgKGYsIGV2ZW50KSkKLSAgICAgICAgaGVscF9l Y2hvX3N0cmluZyA9IHByZXZpb3VzX2hlbHBfZWNob19zdHJpbmc7Ci0KLSAgICAgIC8qIElmIHRo ZSBjb250ZW50cyBvZiB0aGUgZ2xvYmFsIHZhcmlhYmxlIGhlbHBfZWNob19zdHJpbmcKLSAgICAg ICAgIGhhcyBjaGFuZ2VkLCBnZW5lcmF0ZSBhIEhFTFBfRVZFTlQuICAqLwotICAgICAgaWYgKCFO SUxQIChoZWxwX2VjaG9fc3RyaW5nKQotCSAgfHwgIU5JTFAgKHByZXZpb3VzX2hlbHBfZWNob19z dHJpbmcpKQotCXsKLQkgIExpc3BfT2JqZWN0IGZyYW1lOwotCi0JICBpZiAoZikKLQkgICAgWFNF VEZSQU1FIChmcmFtZSwgZik7Ci0JICBlbHNlCi0JICAgIGZyYW1lID0gUW5pbDsKLQotCSAgZ2Vu X2hlbHBfZXZlbnQgKGhlbHBfZWNob19zdHJpbmcsIGZyYW1lLCBoZWxwX2VjaG9fd2luZG93LAot CQkgICAgICAgICAgaGVscF9lY2hvX29iamVjdCwgaGVscF9lY2hvX3Bvcyk7Ci0JICBjb3VudCsr OwotCX0KKyAgICAgIC8qIEhhcyB0aGUgbW91c2UgbW92ZWQgb2ZmIHRoZSBnbHlwaCBpdCB3YXMg b24gYXQgdGhlIGxhc3QKKyAgICAgICAgIHNpZ2h0aW5nPyAgKi8KKyAgICAgIGlmIChldmVudC0+ eCAhPSBsYXN0X21vdXNlX3ggfHwgZXZlbnQtPnkgIT0gbGFzdF9tb3VzZV95KQorICAgICAgICB7 CisgICAgICAgICAgLyogRklYTUU6IFRoZXNlIHRocmVlIGxpbmVzIGNhbiBub3QgYmUgbW92ZWQg aW50bworICAgICAgICAgICAgIHVwZGF0ZV9tb3VzZV9wb3NpdGlvbiB1bmxlc3MgeHRlcm0tbW91 c2UgZ2V0cyB1cGRhdGVkIHRvCisgICAgICAgICAgICAgZ2VuZXJhdGUgbW91c2UgZXZlbnRzIHZp YSBDIGNvZGUuICBTZWUKKyAgICAgICAgICAgICBodHRwczovL2xpc3RzLmdudS5vcmcvYXJjaGl2 ZS9odG1sL2VtYWNzLWRldmVsLzIwMjAtMTEvbXNnMDAxNjMuaHRtbCAqLworICAgICAgICAgIGxh c3RfbW91c2VfeCA9IGV2ZW50LT54OworICAgICAgICAgIGxhc3RfbW91c2VfeSA9IGV2ZW50LT55 OworICAgICAgICAgIGYtPm1vdXNlX21vdmVkID0gMTsKKworICAgICAgICAgIGNvdW50ICs9IHVw ZGF0ZV9tb3VzZV9wb3NpdGlvbiAoZiwgZXZlbnQtPngsIGV2ZW50LT55KTsKKyAgICAgICAgfQog ICAgIH0KICAgZWxzZQogICAgIHsKLS0gCjIuMjAuMQoK --=_5899305b7c7449f2540e5ee733b7f3ab Content-Transfer-Encoding: base64 Content-Type: text/x-diff; name=0002-lisp-faces.el-mode-line-highlight-Use-box-only-on-no.patch Content-Disposition: attachment; filename=0002-lisp-faces.el-mode-line-highlight-Use-box-only-on-no.patch; size=730 RnJvbSBkY2YyYjcwNzBmNDg2NzY5NjBmZDk5ZjQ5N2RmNmJjYjEwMzVjZTJhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKYXJlZCBGaW5kZXIgPGphcmVkQGZpbmRlci5vcmc+CkRhdGU6 IFRodSwgNSBOb3YgMjAyMCAyMToxNTowOCAtMDgwMApTdWJqZWN0OiBbUEFUQ0ggMi8yXSAqIGxp c3AvZmFjZXMuZWwgKG1vZGUtbGluZS1oaWdobGlnaHQpOiBVc2UgOmJveCBvbmx5IG9uCiBub24t VFRZcy4KCi0tLQogbGlzcC9mYWNlcy5lbCB8IDIgKy0KIDEgZmlsZSBjaGFuZ2VkLCAxIGluc2Vy dGlvbigrKSwgMSBkZWxldGlvbigtKQoKZGlmZiAtLWdpdCBhL2xpc3AvZmFjZXMuZWwgYi9saXNw L2ZhY2VzLmVsCmluZGV4IDcyOGY4YjBmZTYuLjg3NWJlZTk5MTAgMTAwNjQ0Ci0tLSBhL2xpc3Av ZmFjZXMuZWwKKysrIGIvbGlzcC9mYWNlcy5lbApAQCAtMjU3OCw3ICsyNTc4LDcgQEAgbW9kZS1s aW5lLWluYWN0aXZlCiAgIDpncm91cCAnYmFzaWMtZmFjZXMpCiAKIChkZWZmYWNlIG1vZGUtbGlu ZS1oaWdobGlnaHQKLSAgJygoKChjbGFzcyBjb2xvcikgKG1pbi1jb2xvcnMgODgpKQorICAnKCgo KHR5cGUgZ3JhcGhpYykgKGNsYXNzIGNvbG9yKSAobWluLWNvbG9ycyA4OCkpCiAgICAgIDpib3gg KDpsaW5lLXdpZHRoIDIgOmNvbG9yICJncmV5NDAiIDpzdHlsZSByZWxlYXNlZC1idXR0b24pKQog ICAgICh0CiAgICAgIDppbmhlcml0IGhpZ2hsaWdodCkpCi0tIAoyLjIwLjEKCg== --=_5899305b7c7449f2540e5ee733b7f3ab--