all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Eli Zaretskii <eliz@gnu.org>
To: "Andrew Scott" <andj.scott@gmail.com>,
	"Po Lu" <luangruo@yahoo.com>,
	"Gerd Möllmann" <gerd.moellmann@gmail.com>,
	"Herbert J. Skuhra" <herbert@gojira.at>
Cc: 65609@debbugs.gnu.org
Subject: bug#65609: 30.0.50; inhibit-eol-conversion breaks revert-buffer
Date: Wed, 30 Aug 2023 16:26:35 +0300	[thread overview]
Message-ID: <837cpchd9w.fsf@gnu.org> (raw)
In-Reply-To: <CAEtA7WcMVGkZ3ETbvosQF_+0mKrwmoCR7CM5rj1hb+H606giMA@mail.gmail.com> (message from Andrew Scott on Tue, 29 Aug 2023 16:45:39 +0100)

> From: Andrew Scott <andj.scott@gmail.com>
> Date: Tue, 29 Aug 2023 16:45:39 +0100
> 
> It appears that inhibit-eol-conversion breaks insert-file-contents's
> replace functionality when a change was made in the middle of the file
> to be reverted as the file contents get duplicated in the buffer. The
> issue can be reproduced on a fresh Emacs with a file named bug.el with
> contents:
> 
>     ;; 1. Launch Emacs: nix run emacs-overlay#emacs-git -- bug.el -Q --load bug.el
>     ;; 2. Outside of Emacs, add text in below empty line:
>     ;; 3. In Emacs, revert-buffer
> 
>     (setq inhibit-eol-conversion t)
> 
> The contents of the buffer after revert-buffer:
> 
>     ;; 1. Launch Emacs: nix run emacs-overlay#emacs-git -- bug.el -Q --load bug.el
>     ;; 2. Outside of Emacs, add text in below empty line:
>     ;; 3. In Emacs, revert-buffer
>     foo
>     (setq inhibit-eol-conversion t)
> 
>     (setq inhibit-eol-conversion t)

Thanks for an easy test case.  We are reading too much from the file
on disk when reverting in this case.

Po Lu, I think we need the patch below to fix this.  Gerd, does this
solve your problem as well, including the abort during bootstrap?
Herbert, I think this could also be related to the problems you see,
so please try the patch below.

diff --git a/src/fileio.c b/src/fileio.c
index 23e1a83..8919e08 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -4805,7 +4805,7 @@ DEFUN ("insert-file-contents", Finsert_file_contents, Sinsert_file_contents,
 
 	/* 'try' is reserved in some compilers (Microsoft C).  */
 	ptrdiff_t trytry = min (gap_size, READ_BUF_SIZE);
-	if (!NILP (end))
+	if (seekable || !NILP (end))
 	  trytry = min (trytry, total - inserted);
 
 	if (!seekable && NILP (end))





  reply	other threads:[~2023-08-30 13:26 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-29 15:45 bug#65609: 30.0.50; inhibit-eol-conversion breaks revert-buffer Andrew Scott
2023-08-30 13:26 ` Eli Zaretskii [this message]
2023-08-30 13:42   ` Gerd Möllmann
2023-08-30 14:22     ` Eli Zaretskii
2023-08-30 13:43   ` Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-08-30 14:18     ` Eli Zaretskii
     [not found]       ` <CAEtA7Wfv8UauiVpjJ669-R=QdC-u32mOhn_S+hQTUr3_9_zK=g@mail.gmail.com>
2023-09-03 15:51         ` Eli Zaretskii
2023-08-30 17:06   ` Herbert J. Skuhra

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=837cpchd9w.fsf@gnu.org \
    --to=eliz@gnu.org \
    --cc=65609@debbugs.gnu.org \
    --cc=andj.scott@gmail.com \
    --cc=gerd.moellmann@gmail.com \
    --cc=herbert@gojira.at \
    --cc=luangruo@yahoo.com \
    /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.