From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Tom Gillespie Newsgroups: gmane.emacs.devel Subject: Re: [PATCH] Fix hack-local-variables for find-file-literally with dos encoding Date: Sun, 15 Aug 2021 14:35:40 -0700 Message-ID: References: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="0000000000005cc44b05c99fdeae" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="13372"; mail-complaints-to="usenet@ciao.gmane.io" To: Emacs developers Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sun Aug 15 23:37:38 2021 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 1mFNp4-0003GQ-3B for ged-emacs-devel@m.gmane-mx.org; Sun, 15 Aug 2021 23:37:38 +0200 Original-Received: from localhost ([::1]:50674 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mFNp1-0003rH-W8 for ged-emacs-devel@m.gmane-mx.org; Sun, 15 Aug 2021 17:37:36 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:55176) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mFNnP-0001mJ-81 for emacs-devel@gnu.org; Sun, 15 Aug 2021 17:35:55 -0400 Original-Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:43901) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mFNnN-0006rN-F3 for emacs-devel@gnu.org; Sun, 15 Aug 2021 17:35:54 -0400 Original-Received: by mail-wm1-x32b.google.com with SMTP id k5-20020a05600c1c85b02902e699a4d20cso10414510wms.2 for ; Sun, 15 Aug 2021 14:35:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to; bh=zZhMeP0WpuGs4JRFQ0V0Fe9r0n7cFPUrAnRs2fLSKmQ=; b=PznXcRIYitHB1EduJxbX8eK8wgjQWEiPmorSGnUWzLAIi3HhXNcVxWObpi/ClDy0qU Hm5/y0+WI7AgGFyt3HFqtXDGZc9OLHRZ/S608kQewro9li8vA/J1AyTro3dLKDpKN6V9 JWTxVkEcBMNGEGh/uaaPa2jROkBW5fe/jxbDomEahPA3yljgpr3UrhKUPPN0juWMgf55 8/JtZCa/S+BQGe4FgvWY6tgMJgr6pv3qkWjFv2YGQ1OZa55TRVLvUmV6jsf2o9t+gU8a 1TAXGJdpN7qrUVYM6ESkNVCbmEizT7OtWMLmrhO6BFnoj1l/LmND0rwSSI1bGFi9qNh5 Kckg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=zZhMeP0WpuGs4JRFQ0V0Fe9r0n7cFPUrAnRs2fLSKmQ=; b=GINvx+J9Ur8+jVNRJS3ENYuwQ883+pPdNajK10FC7xlcPvMRd5NTZ3eRnhcK9xkN9v T8uLBCPFFtxx/G95emVqzBBNJ0UdbZLdti8u83KvBX8FVL/qARnVhCL6HdLsjW3LPOym 8OcbpieeQYS5u4CGArH4eF5NqK70uD9CmFZ1vicun/rDLjLKv9h2bRLDhqhHL1c6BoSr 86/jbk6HProYBdoXIL/p4ZdNRnqw4L1jsZXnWY1HWOfRtjABszmwj2jevHEfipxatd8n 8tvK9mi+47i/cT3szS1lIe5ZZ8ggF6IEM+2veKw6qQ8uo6izFcy6KfoGa/sVPXJ3dRk9 KjNg== X-Gm-Message-State: AOAM532bduNOXeykvUW7mzHeXTu/JH9BQlC8XiDLLn6FKevwMaGlKsGj Df9mMfmXPkcorLi10+/GGfWwp8q4v7Z0B0Rmhftxtceq X-Google-Smtp-Source: ABdhPJw85fqYxCJCdHJZIrX267qwSZe2/3wi2Kw94XSQuOhea0PstN28dMOq2Avb+bi0EZUoJjZRHTI00/XSuKx0xkA= X-Received: by 2002:a05:600c:a44:: with SMTP id c4mr12222377wmq.83.1629063351149; Sun, 15 Aug 2021 14:35:51 -0700 (PDT) In-Reply-To: Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=tgbugs@gmail.com; helo=mail-wm1-x32b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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:272411 Archived-At: --0000000000005cc44b05c99fdeae Content-Type: text/plain; charset="UTF-8" Here is the backport to the emacs-27 branch. Best! Tom On Sun, Aug 15, 2021 at 2:23 PM Tom Gillespie wrote: > > Hi, > This patch provides a test and a fix for an edge case when opening > files literally that have dos crlf line endings. The patch was made > against master, but a similar fix could be issued for a potential > Emacs 27.3 release if one is forthcoming. Best! > Tom --0000000000005cc44b05c99fdeae Content-Type: text/x-patch; charset="US-ASCII"; name="0001-Backport-hack-local-variables-for-find-file-literall.patch" Content-Disposition: attachment; filename="0001-Backport-hack-local-variables-for-find-file-literall.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_ksdq8rgz0 RnJvbSAxYzZhNzZhZTljNDM2ZmU4OWJiOWFiNjM4Njk2ZTQ1MDlhMTAwYTk2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUb20gR2lsbGVzcGllIDx0Z2J1Z3NAZ21haWwuY29tPgpEYXRl OiBTdW4sIDE1IEF1ZyAyMDIxIDE0OjMxOjQzIC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gQmFja3Bv cnQgaGFjay1sb2NhbC12YXJpYWJsZXMgZm9yIGZpbmQtZmlsZS1saXRlcmFsbHkgd2l0aAogZG9z CgoqIGxpc3AvZmlsZXMuZWwgKGhhY2stbG9jYWwtdmFyaWFibGVzLS1maW5kLXZhcmlhYmxlcyk6 IFVwZGF0ZQpoYWNrLWxvY2FsLXZhcmlhYmxlcy0tZmluZC12YXJpYWJsZXMgdG8gY2hlY2sgd2hl dGhlciBhIGJ1ZmZlciBoYXMKZmluZC1maWxlLWxpdGVyYWxseSBzZXQgYmVmb3JlIGNvbnZlcnRp bmcgP1xebSB0byA/XG4uCgoqIHRlc3QvbGlzcC9maWxlcy10ZXN0cy5lbCAoZmlsZXMtdGVzdHMt aGFjay1sb2NhbC1saXRlcmFsLWRvcyk6IEFkZGVkCnRlc3QgZm9yIGNhbGxpbmcgaGFjay1sb2Nh bC12YXJpYWJsZXMgb24gZmlsZXMgd2l0aCBkb3MgZW5jb2Rpbmcgb3BlbmVkCndpdGggZmluZC1m aWxlLWxpdGVyYWxseS4KClRoaXMgZml4ZXMgYSBidWcgd2hlcmUgaGFjay1sb2NhbC12YXJpYWJs ZXMgd291bGQgZmFpbCB0byBmaW5kIGEKbWF0Y2hpbmcgc3VmZml4IGZvciBsb2NhbCB2YXJpYWJs ZXMgd2hlbiBmaWxlcyB3aXRoIGRvcyBsaW5lIGVuZGluZ3MKd2VyZSBvcGVuZWQgbGl0ZXJhbGx5 IHVzaW5nIGZpbmQtZmlsZS1saXRlcmFsbHkuCgpUaGUgdW5sZXNzIGJyYW5jaCBpcyBjb25kaXRp b25lZCBvbiBidWZmZXItZmlsZS1jb2Rpbmctc3lzdGVtIGJlY2F1c2UKdGhlIGZpbmQtZmlsZS1s aXRlcmFsbHkgbG9jYWwgdmFyaWFibGUgaXMgc2V0IGFmdGVyIHRoZSBjYWxsIHRvCnNldC1idWZm ZXItbWFqb3ItbW9kZSBpbiBmaW5kLWZpbGUtbm9zZWxlY3QtMS4gSWYgZmluZC1maWxlLWxpdGVy YWxseQp3YXMgc2V0IGJlZm9yZSBjYWxsaW5nIHNldC1idWZmZXItbWFqb3ItbW9kZSB0aGVuIGl0 IGNvdWxkIGJlIHVzZQpkaXJlY3RseS4KLS0tCiBsaXNwL2ZpbGVzLmVsICAgICAgICAgICAgfCAg NiArKysrLS0KIHRlc3QvbGlzcC9maWxlcy10ZXN0cy5lbCB8IDExICsrKysrKysrKysrCiAyIGZp bGVzIGNoYW5nZWQsIDE1IGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvbGlzcC9maWxlcy5lbCBiL2xpc3AvZmlsZXMuZWwKaW5kZXggMGEwMGI4YjgyOC4uODZjNTky ZTQ4MCAxMDA2NDQKLS0tIGEvbGlzcC9maWxlcy5lbAorKysgYi9saXNwL2ZpbGVzLmVsCkBAIC0z NzQyLDcgKzM3NDIsOCBAQCBoYWNrLWxvY2FsLXZhcmlhYmxlcwogCSAgICAgIChmb3J3YXJkLWxp bmUgMSkKIAkgICAgICAobGV0ICgoc3RhcnRwb3MgKHBvaW50KSkKIAkJICAgIGVuZHBvcwotCQkg ICAgKHRoaXNidWYgKGN1cnJlbnQtYnVmZmVyKSkpCisJCSAgICAodGhpc2J1ZiAoY3VycmVudC1i dWZmZXIpKQorCQkgICAgKG5vY29udiAoZXEgYnVmZmVyLWZpbGUtY29kaW5nLXN5c3RlbSAnbm8t Y29udmVyc2lvbikpKQogCQkoc2F2ZS1leGN1cnNpb24KIAkJICAodW5sZXNzIChsZXQgKChjYXNl LWZvbGQtc2VhcmNoIHQpKQogCQkJICAgIChyZS1zZWFyY2gtZm9yd2FyZApAQCAtMzc1OCw3ICsz NzU5LDggQEAgaGFjay1sb2NhbC12YXJpYWJsZXMKIAkJKHdpdGgtdGVtcC1idWZmZXIKIAkJICAo aW5zZXJ0LWJ1ZmZlci1zdWJzdHJpbmcgdGhpc2J1ZiBzdGFydHBvcyBlbmRwb3MpCiAJCSAgKGdv dG8tY2hhciAocG9pbnQtbWluKSkKLQkJICAoc3Vic3QtY2hhci1pbi1yZWdpb24gKHBvaW50KSAo cG9pbnQtbWF4KSA/XF5tID9cbikKKwkJICAodW5sZXNzIG5vY29udgorCQkgICAgKHN1YnN0LWNo YXItaW4tcmVnaW9uIChwb2ludCkgKHBvaW50LW1heCkgP1xebSA/XG4pKQogCQkgICh3aGlsZSAo bm90IChlb2JwKSkKIAkJICAgIDs7IERpc2NhcmQgdGhlIHByZWZpeC4KIAkJICAgIChpZiAobG9v a2luZy1hdCBwcmVmaXgpCmRpZmYgLS1naXQgYS90ZXN0L2xpc3AvZmlsZXMtdGVzdHMuZWwgYi90 ZXN0L2xpc3AvZmlsZXMtdGVzdHMuZWwKaW5kZXggMWZjODAwNzM1Mi4uZDI0YTRjNWEyMyAxMDA2 NDQKLS0tIGEvdGVzdC9saXNwL2ZpbGVzLXRlc3RzLmVsCisrKyBiL3Rlc3QvbGlzcC9maWxlcy10 ZXN0cy5lbApAQCAtMTUwLDYgKzE1MCwxNyBAQCBmaWxlcy10ZXN0cy1sb2NhbC12YXJpYWJsZXMK ICAgICAgICAgKGRvbGlzdCAoc3VidGVzdCAoY2RyIHRlc3QpKQogICAgICAgICAgIChzaG91bGQg KGZpbGUtdGVzdC0tZG8tbG9jYWwtdmFyaWFibGVzLXRlc3Qgc3RyIHN1YnRlc3QpKSkpKSkpCiAK KyhlcnQtZGVmdGVzdCBmaWxlcy10ZXN0cy1oYWNrLWxvY2FsLWxpdGVyYWwtZG9zICgpCisgIChs ZXQgKCh0ZW1wZmlsZSAobWFrZS10ZW1wLWZpbGUgImZpbGVzLXRlc3RzLXRlc3QtaGFjay1sb2Nh bC1saXRlcmFsLWRvcyIgbmlsICIuZWwiKSkpCisgICAgKHVud2luZC1wcm90ZWN0CisgICAgICAg IChwcm9nbgorICAgICAgICAgICh3aXRoLXRlbXAtYnVmZmVyCisgICAgICAgICAgICAoaW5zZXJ0 ICI7OyAtKi0gbW9kZTogRW1hY3MtTGlzcCAtKi1cXm1cbjs7IExvY2FsIFZhcmlhYmxlczpcXm1c bjs7IGxvbDogdFxebVxuOzsgRW5kOlxebVxuIikKKyAgICAgICAgICAgICh3cml0ZS1maWxlIHRl bXBmaWxlKSkKKyAgICAgICAgICAod2l0aC1jdXJyZW50LWJ1ZmZlciAoZmluZC1maWxlLWxpdGVy YWxseSB0ZW1wZmlsZSkKKyAgICAgICAgICAgIChoYWNrLWxvY2FsLXZhcmlhYmxlcykpKQorICAg ICAgKGRlbGV0ZS1maWxlIHRlbXBmaWxlKSkpKQorCiAoZGVmdmFyIGZpbGVzLXRlc3QtYnVnLTE4 MTQxLWZpbGUKICAgKGV4cGFuZC1maWxlLW5hbWUgImRhdGEvZmlsZXMtYnVnMTgxNDEuZWwuZ3oi IChnZXRlbnYgIkVNQUNTX1RFU1RfRElSRUNUT1JZIikpCiAgICJUZXN0IGZpbGUgZm9yIGJ1ZyMx ODE0MS4iKQotLSAKMi4zMS4xCgo= --0000000000005cc44b05c99fdeae--