From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Lars Ingebrigtsen Newsgroups: gmane.emacs.devel Subject: Re: [PATCH] Fix hack-local-variables for find-file-literally with dos encoding Date: Sun, 15 Aug 2021 23:52:31 +0200 Message-ID: <87o89ygyu8.fsf@gnus.org> References: Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="40529"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) Cc: Emacs developers To: Tom Gillespie Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sun Aug 15 23:53:21 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 1mFO4F-000AGr-J7 for ged-emacs-devel@m.gmane-mx.org; Sun, 15 Aug 2021 23:53:19 +0200 Original-Received: from localhost ([::1]:53184 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mFO4D-0006De-Ml for ged-emacs-devel@m.gmane-mx.org; Sun, 15 Aug 2021 17:53:17 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:56286) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mFO3e-0005Xl-8O for emacs-devel@gnu.org; Sun, 15 Aug 2021 17:52:42 -0400 Original-Received: from quimby.gnus.org ([2a01:4f9:2b:f0f::2]:54058) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mFO3c-00012b-No for emacs-devel@gnu.org; Sun, 15 Aug 2021 17:52:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Content-Type:MIME-Version:Message-ID:In-Reply-To:Date: References:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=wn0fO/CmJZLmW+rZJ01AdxK5AlPWBFq9UGbHOPPS3Os=; b=LHqydMsKrmusmKTLEPqsVhhXcw SGx9l7haIkjtTB3RncxuXPZuxCQt+MGguI3xLr59kkMWhZ3Hour333Qoece7Id9IW1ORLLRqSng0v L/JzejgJrzeLj+V26/NBa9kSes0+UJap/Z/B609EM1mhEwitIOOGLlyu3YjBjKbrASb0=; Original-Received: from [84.212.220.105] (helo=elva) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mFO3W-0005GS-3e; Sun, 15 Aug 2021 23:52:38 +0200 In-Reply-To: (Tom Gillespie's message of "Sun, 15 Aug 2021 14:23:00 -0700") Received-SPF: pass client-ip=2a01:4f9:2b:f0f::2; envelope-from=larsi@gnus.org; helo=quimby.gnus.org X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_DNSWL_LOW=-0.7, 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:272412 Archived-At: Tom Gillespie writes: > 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! There probably won't be a 27.3... > - (subst-char-in-region (point) (point-max) ?\^m ?\n) > + (unless noconv > + (subst-char-in-region (point) (point-max) ?\^m ?\n)) I don't quite understand the logic here -- shouldn't this be a (when noconv ? That is, if we're visiting the file literally, we want to delete the carriage returns, but not otherwise? (If we're not visiting the file literally, the CRLFs will already have been translated into newlines.) > + (with-current-buffer (find-file-literally tempfile) > + (hack-local-variables))) Should probably be a `should' in here to make it work as a test, I think. -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no