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: Mon, 16 Aug 2021 14:01:08 +0200 Message-ID: <87bl5xfvjv.fsf@gnus.org> References: <87o89ygyu8.fsf@gnus.org> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="9616"; 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 Mon Aug 16 14:03:41 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 1mFbLB-0002K7-Rf for ged-emacs-devel@m.gmane-mx.org; Mon, 16 Aug 2021 14:03:41 +0200 Original-Received: from localhost ([::1]:35382 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mFbLA-0003qC-PU for ged-emacs-devel@m.gmane-mx.org; Mon, 16 Aug 2021 08:03:40 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:55994) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mFbIt-0001Io-4w for emacs-devel@gnu.org; Mon, 16 Aug 2021 08:01:19 -0400 Original-Received: from quimby.gnus.org ([2a01:4f9:2b:f0f::2]:60560) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mFbIp-0001aW-R9 for emacs-devel@gnu.org; Mon, 16 Aug 2021 08:01:18 -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=IaKYq3vAFwkIn9DsQn8NYPLR7SYH2YclmKM1T1CtV3E=; b=hGiFlgeWhEaNgkkFPZqUBMvB4a kwv4JLDKL6R3jk9q5KhbLnFvcbGDdu2vqmgp/DoOEwzOCHOhUYWcvqaEAFLYwMt44j7OI9WrXYB8y sTq1rZ4Yf6qZYPmv8coU/5uVitx6bCIPt41eozDFlToMyUggBzhZyeIOZEUI50XD9ZlU=; 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 1mFbIi-0004Ss-Vv; Mon, 16 Aug 2021 14:01:13 +0200 In-Reply-To: (Tom Gillespie's message of "Sun, 15 Aug 2021 15:21:19 -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:272429 Archived-At: Tom Gillespie writes: > No, when we read a file literally we don't want to normalize anything. > The issue is that 'when noconv' is set (i.e. we are in find-file-literally) > then we don't want to convert ?\^m because the value of suffix > contains ?\^m. Does this make sense? I tried other approaches > including modifying the suffix but this one was by far the cleanest. Ah, I see what you mean now. The code in `hack-local-variables--find-variables' is clear enough in what it does, but it's rather obscure in what it intends to do. The issue is that if you've loaded a DOS file literally, and then you want to run the local variables anyway, then you have a file like this: ;; -*- mode: Emacs-Lisp -*-^M ;; Local Variables:^M ;; lol: t^M ;; End:^M Then we have this: (when (let ((case-fold-search t)) (search-forward "Local Variables:" nil t)) (skip-chars-forward " \t") ;; suffix is what comes after "local variables:" in its line. ;; prefix is what comes before "local variables:" in its line. (let ((suffix (concat (regexp-quote (buffer-substring (point) (line-end-position))) "$")) So... it notes all characters that are after "local variables:", which in this case is ^M. Then later it does (with-temp-buffer (insert-buffer-substring thisbuf startpos endpos) (goto-char (point-min)) (subst-char-in-region (point) (point-max) ?\^m ?\n) (while (not (eobp)) ;; Discard the prefix. (if (looking-at prefix) (delete-region (point) (match-end 0)) (error "Local variables entry is missing the prefix")) and this fails. I think the intention here is to be able to say: ;; Local Variables:my-identifier ;; lol: t ;; End:my-identifier although that's not something I can remember seeing in the wild. So I think your revised patch is correct -- the `subst-char-in-region' thing is just plain wrong and should be removed. Does anybody else have any insights into this corner of the hack-local-variables code? -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no