From: Eli Zaretskii <eliz@gnu.org>
To: Kazuhiro Ito <kzhr@d1.dion.ne.jp>
Cc: 61321@debbugs.gnu.org
Subject: bug#61321: 30.0.50; Fail to load file with file variables and CRLF EOL without EOL conversion
Date: Mon, 06 Feb 2023 17:17:46 +0200 [thread overview]
Message-ID: <83zg9qq0v9.fsf@gnu.org> (raw)
In-Reply-To: <86a61qnb8m.wl--xmue@d1.dion.ne.jp> (message from Kazuhiro Ito on Mon, 06 Feb 2023 23:02:01 +0900)
> Date: Mon, 06 Feb 2023 23:02:01 +0900
> From: Kazuhiro Ito <kzhr@d1.dion.ne.jp>
>
> (let ((filename (expand-file-name "test.txt"
> temporary-file-directory)))
> (with-temp-buffer
> (setq buffer-file-coding-system 'dos)
> (insert "This is a test.\n"
> "\n"
> "Local Variables:\n"
> "comment-column: 0\n"
> "End:\n")
> (write-file filename))
> (unwind-protect
> (let (;; (coding-system-for-read 'unix)
> (inhibit-eol-conversion t)
> )
> (find-file filename))
> (delete-file filename)))
>
> -> Local variables entry is missing the suffix
Thanks. Does the patch below give good results?
diff --git a/lisp/files.el b/lisp/files.el
index 9da8244..b0ec6bb 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -4017,6 +4017,7 @@ hack-local-variables--find-variables
(forward-line 1)
(let ((startpos (point))
endpos
+ (selective-p (eq selective-display t))
(thisbuf (current-buffer)))
(save-excursion
(unless (let ((case-fold-search t))
@@ -4033,7 +4034,8 @@ hack-local-variables--find-variables
(with-temp-buffer
(insert-buffer-substring thisbuf startpos endpos)
(goto-char (point-min))
- (subst-char-in-region (point) (point-max) ?\^m ?\n)
+ (if selective-p
+ (subst-char-in-region (point) (point-max) ?\r ?\n))
(while (not (eobp))
;; Discard the prefix.
(if (looking-at prefix)
next prev parent reply other threads:[~2023-02-06 15:17 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-06 14:02 bug#61321: 30.0.50; Fail to load file with file variables and CRLF EOL without EOL conversion Kazuhiro Ito
2023-02-06 15:17 ` Eli Zaretskii [this message]
2023-02-06 16:01 ` Kazuhiro Ito
2023-02-06 16:30 ` Eli Zaretskii
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=83zg9qq0v9.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=61321@debbugs.gnu.org \
--cc=kzhr@d1.dion.ne.jp \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.