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: [PATCH] Fix hack-local-variables for find-file-literally with dos encoding Date: Sun, 15 Aug 2021 14:23:00 -0700 Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="00000000000018b83305c99fb1ba" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="26819"; 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:24:05 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 1mFNbw-0006p6-QX for ged-emacs-devel@m.gmane-mx.org; Sun, 15 Aug 2021 23:24:04 +0200 Original-Received: from localhost ([::1]:42244 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mFNbu-0005ac-Iv for ged-emacs-devel@m.gmane-mx.org; Sun, 15 Aug 2021 17:24:02 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:53854) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mFNb9-0004uR-FU for emacs-devel@gnu.org; Sun, 15 Aug 2021 17:23:15 -0400 Original-Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:37564) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mFNb8-0006ro-0H for emacs-devel@gnu.org; Sun, 15 Aug 2021 17:23:15 -0400 Original-Received: by mail-wr1-x42d.google.com with SMTP id r6so20934789wrt.4 for ; Sun, 15 Aug 2021 14:23:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=XumF6b1TTc+taoQJfxPI95mwqpS9CLFWmnlgjzuwpCo=; b=Sb9B4U8dql0jT3jDzAVbjaGu/UqJ7Z+Mj4omZDfqCwQDsJxYhZQeFnKUqT3yTynvD+ iVLYKjllCreudL4Kx380qZCMDWD7uJiNDzsA1h8HEpGYWgEKH3oKE34ZdmBywg8KRBpV SqESM4hvRjKwqAISPecexpbKozEK5Xey2bSJ2EGAiox1hgF/9vg9k980bZhVaU2rank6 LTWskaYRBQl29QhakhfRYEmbZUm/NTWcGKgASoWUuw+P0r8qDNwKSagnLFvNGIL37Ph/ bmMiZiUghJ6U+tYt6TdUmrKbk5Rbsr3iwKHgttxb/fa1Z31AWanx91Evo4x0b3NKonPO IvXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=XumF6b1TTc+taoQJfxPI95mwqpS9CLFWmnlgjzuwpCo=; b=ei2IX0Pt5LNyqnm7Bx0MZz4pZZvAZIpC1Ob10anC3YEaylp5L821iOKzwAFXCE0X38 PuySRpsi6gXVXYszCRYLu7intPQZJIv7vGRCfs/qwv99nfbW1kYtmLZJDsZjrvIxCyEY 5Ie2/Cy0eMXePQuGXZtkE1FD5o1HH/nBf0BvLRLO4H02V4QERpC+9dM68+wQMNdpsqWV M8J2bozuYgo8Gmt7p5VSbuA+eLZJxJAUIJyyf3/kso/PYQNZhDKev5UpIg1gs78IIGF1 LrWMT03c8gNm5RaHeAK3EJrd6VSsqCHubqC+494uIf2qXMP8sv3rW1LIlArLAI1OAmmN 5oYg== X-Gm-Message-State: AOAM530aGydccEZr3+QCBuPVgl+iU4KbLoi/Gm7gXZALvH/lkFZ8ERrp GbMy77TkP0T0w2DMR7/tpTZbLmm9Fq6ixR19P+et6DbP X-Google-Smtp-Source: ABdhPJzniWuWRfPpXCY825rBtN9A0VJ+wg33RPO5DXJZuVIo4L0WbFBCcrMT3tslYXsRPX9GUNKmfKA+vztnUVdEnbY= X-Received: by 2002:adf:f541:: with SMTP id j1mr3367144wrp.180.1629062591708; Sun, 15 Aug 2021 14:23:11 -0700 (PDT) Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=tgbugs@gmail.com; helo=mail-wr1-x42d.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:272410 Archived-At: --00000000000018b83305c99fb1ba Content-Type: text/plain; charset="UTF-8" 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 --00000000000018b83305c99fb1ba Content-Type: text/x-patch; charset="US-ASCII"; name="0001-Fix-hack-local-variables-for-find-file-literally-wit.patch" Content-Disposition: attachment; filename="0001-Fix-hack-local-variables-for-find-file-literally-wit.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_ksdpsahr0 RnJvbSBiY2JjOWFmM2RkY2U1ZTA3YWZjNDJiZGRiMDllNWZmNDNiYWYyMTlmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUb20gR2lsbGVzcGllIDx0Z2J1Z3NAZ21haWwuY29tPgpEYXRl OiBTdW4sIDE1IEF1ZyAyMDIxIDE0OjE3OjQyIC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gRml4IGhh Y2stbG9jYWwtdmFyaWFibGVzIGZvciBmaW5kLWZpbGUtbGl0ZXJhbGx5IHdpdGggZG9zCiBlbmNv ZGluZwoKKiBsaXNwL2ZpbGVzLmVsIChoYWNrLWxvY2FsLXZhcmlhYmxlcy0tZmluZC12YXJpYWJs ZXMpOiBVcGRhdGUKaGFjay1sb2NhbC12YXJpYWJsZXMtLWZpbmQtdmFyaWFibGVzIHRvIGNoZWNr IHdoZXRoZXIgYSBidWZmZXIgaGFzCmZpbmQtZmlsZS1saXRlcmFsbHkgc2V0IGJlZm9yZSBjb252 ZXJ0aW5nID9cXm0gdG8gP1xuLgoKKiB0ZXN0L2xpc3AvZmlsZXMtdGVzdHMuZWwgKGZpbGVzLXRl c3RzLWhhY2stbG9jYWwtbGl0ZXJhbC1kb3MpOiBBZGRlZAp0ZXN0IGZvciBjYWxsaW5nIGhhY2st bG9jYWwtdmFyaWFibGVzIG9uIGZpbGVzIHdpdGggZG9zIGVuY29kaW5nIG9wZW5lZAp3aXRoIGZp bmQtZmlsZS1saXRlcmFsbHkuCgpUaGlzIGZpeGVzIGEgYnVnIHdoZXJlIGhhY2stbG9jYWwtdmFy aWFibGVzIHdvdWxkIGZhaWwgdG8gZmluZCBhCm1hdGNoaW5nIHN1ZmZpeCBmb3IgbG9jYWwgdmFy aWFibGVzIHdoZW4gZmlsZXMgd2l0aCBkb3MgbGluZSBlbmRpbmdzCndlcmUgb3BlbmVkIGxpdGVy YWxseSB1c2luZyBmaW5kLWZpbGUtbGl0ZXJhbGx5LgoKVGhlIHVubGVzcyBicmFuY2ggaXMgY29u ZGl0aW9uZWQgb24gYnVmZmVyLWZpbGUtY29kaW5nLXN5c3RlbSBiZWNhdXNlCnRoZSBmaW5kLWZp bGUtbGl0ZXJhbGx5IGxvY2FsIHZhcmlhYmxlIGlzIHNldCBhZnRlciB0aGUgY2FsbCB0bwpzZXQt YnVmZmVyLW1ham9yLW1vZGUgaW4gZmluZC1maWxlLW5vc2VsZWN0LTEuIElmIGZpbmQtZmlsZS1s aXRlcmFsbHkKd2FzIHNldCBiZWZvcmUgY2FsbGluZyBzZXQtYnVmZmVyLW1ham9yLW1vZGUgdGhl biBpdCBjb3VsZCBiZSB1c2UKZGlyZWN0bHkuCi0tLQogbGlzcC9maWxlcy5lbCAgICAgICAgICAg IHwgIDYgKysrKy0tCiB0ZXN0L2xpc3AvZmlsZXMtdGVzdHMuZWwgfCAxMSArKysrKysrKysrKwog MiBmaWxlcyBjaGFuZ2VkLCAxNSBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL2xpc3AvZmlsZXMuZWwgYi9saXNwL2ZpbGVzLmVsCmluZGV4IDg3NWFjNTUzMTYuLmMz NTE4ZDU5YjkgMTAwNjQ0Ci0tLSBhL2xpc3AvZmlsZXMuZWwKKysrIGIvbGlzcC9maWxlcy5lbApA QCAtMzkzMSw3ICszOTMxLDggQEAgaGFjay1sb2NhbC12YXJpYWJsZXMtLWZpbmQtdmFyaWFibGVz CiAJICAoZm9yd2FyZC1saW5lIDEpCiAJICAobGV0ICgoc3RhcnRwb3MgKHBvaW50KSkKIAkgICAg ICAgIGVuZHBvcwotCSAgICAgICAgKHRoaXNidWYgKGN1cnJlbnQtYnVmZmVyKSkpCisJICAgICAg ICAodGhpc2J1ZiAoY3VycmVudC1idWZmZXIpKQorCSAgICAgICAgKG5vY29udiAoZXEgYnVmZmVy LWZpbGUtY29kaW5nLXN5c3RlbSAnbm8tY29udmVyc2lvbikpKQogCSAgICAoc2F2ZS1leGN1cnNp b24KIAkgICAgICAodW5sZXNzIChsZXQgKChjYXNlLWZvbGQtc2VhcmNoIHQpKQogCQkgICAgICAg IChyZS1zZWFyY2gtZm9yd2FyZApAQCAtMzk0Nyw3ICszOTQ4LDggQEAgaGFjay1sb2NhbC12YXJp YWJsZXMtLWZpbmQtdmFyaWFibGVzCiAJICAgICh3aXRoLXRlbXAtYnVmZmVyCiAJICAgICAgKGlu c2VydC1idWZmZXItc3Vic3RyaW5nIHRoaXNidWYgc3RhcnRwb3MgZW5kcG9zKQogCSAgICAgIChn b3RvLWNoYXIgKHBvaW50LW1pbikpCi0JICAgICAgKHN1YnN0LWNoYXItaW4tcmVnaW9uIChwb2lu dCkgKHBvaW50LW1heCkgP1xebSA/XG4pCisJICAgICAgKHVubGVzcyBub2NvbnYKKwkgICAgICAg IChzdWJzdC1jaGFyLWluLXJlZ2lvbiAocG9pbnQpIChwb2ludC1tYXgpID9cXm0gP1xuKSkKIAkg ICAgICAod2hpbGUgKG5vdCAoZW9icCkpCiAJICAgICAgICA7OyBEaXNjYXJkIHRoZSBwcmVmaXgu CiAJICAgICAgICAoaWYgKGxvb2tpbmctYXQgcHJlZml4KQpkaWZmIC0tZ2l0IGEvdGVzdC9saXNw L2ZpbGVzLXRlc3RzLmVsIGIvdGVzdC9saXNwL2ZpbGVzLXRlc3RzLmVsCmluZGV4IGZiMjRiOTg1 OTUuLjgzNjU5ZDkwMGUgMTAwNjQ0Ci0tLSBhL3Rlc3QvbGlzcC9maWxlcy10ZXN0cy5lbAorKysg Yi90ZXN0L2xpc3AvZmlsZXMtdGVzdHMuZWwKQEAgLTE2NCw2ICsxNjQsMTcgQEAgZmlsZXMtdGVz dHMtcGVybWFuZW50LWxvY2FsLXZhcmlhYmxlcwogICAgICAgKGhhY2stbG9jYWwtdmFyaWFibGVz KQogICAgICAgKHNob3VsZCAoZXEgbGV4aWNhbC1iaW5kaW5nIG5pbCkpKSkpCiAKKyhlcnQtZGVm dGVzdCBmaWxlcy10ZXN0cy1oYWNrLWxvY2FsLWxpdGVyYWwtZG9zICgpCisgIChsZXQgKCh0ZW1w ZmlsZSAobWFrZS10ZW1wLWZpbGUgImZpbGVzLXRlc3RzLXRlc3QtaGFjay1sb2NhbC1saXRlcmFs LWRvcyIgbmlsICIuZWwiKSkpCisgICAgKHVud2luZC1wcm90ZWN0CisgICAgICAgIChwcm9nbgor ICAgICAgICAgICh3aXRoLXRlbXAtYnVmZmVyCisgICAgICAgICAgICAoaW5zZXJ0ICI7OyAtKi0g bW9kZTogRW1hY3MtTGlzcCAtKi1cXm1cbjs7IExvY2FsIFZhcmlhYmxlczpcXm1cbjs7IGxvbDog dFxebVxuOzsgRW5kOlxebVxuIikKKyAgICAgICAgICAgICh3cml0ZS1maWxlIHRlbXBmaWxlKSkK KyAgICAgICAgICAod2l0aC1jdXJyZW50LWJ1ZmZlciAoZmluZC1maWxlLWxpdGVyYWxseSB0ZW1w ZmlsZSkKKyAgICAgICAgICAgIChoYWNrLWxvY2FsLXZhcmlhYmxlcykpKQorICAgICAgKGRlbGV0 ZS1maWxlIHRlbXBmaWxlKSkpKQorCiAoZGVmdmFyIGZpbGVzLXRlc3QtYnVnLTE4MTQxLWZpbGUK ICAgKGVydC1yZXNvdXJjZS1maWxlICJmaWxlcy1idWcxODE0MS5lbC5neiIpCiAgICJUZXN0IGZp bGUgZm9yIGJ1ZyMxODE0MS4iKQotLSAKMi4zMS4xCgo= --00000000000018b83305c99fb1ba--