From debbugs-submit-bounces@debbugs.gnu.org Wed Aug 30 03:18:40 2023 Received: (at submit) by debbugs.gnu.org; 30 Aug 2023 07:18:40 +0000 Received: from localhost ([127.0.0.1]:52015 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qbFTL-0006zK-58 for submit@debbugs.gnu.org; Wed, 30 Aug 2023 03:18:40 -0400 Received: from lists.gnu.org ([2001:470:142::17]:57788) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qb0vJ-00034g-6d for submit@debbugs.gnu.org; Tue, 29 Aug 2023 11:46:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qb0ut-0006mh-9X for bug-gnu-emacs@gnu.org; Tue, 29 Aug 2023 11:46:15 -0400 Received: from mail-yb1-xb30.google.com ([2607:f8b0:4864:20::b30]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qb0uh-0004aH-FT for bug-gnu-emacs@gnu.org; Tue, 29 Aug 2023 11:46:01 -0400 Received: by mail-yb1-xb30.google.com with SMTP id 3f1490d57ef6-d7766072ba4so7452990276.1 for ; Tue, 29 Aug 2023 08:45:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693323951; x=1693928751; darn=gnu.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=sy7NKuS4tbOX+1DhUrZhrpInHjxMKEDwrcJ1jkkBjHo=; b=Y4gChaJOE+2lCyDXTVcMw+dSxFRrPaDnlUGK4cnOKC4YXzzeLaJrtNhe0MklfvWlrd 8xqzXzzWhIaTOvfXq1eVFVi5F23iYzgGaMLK8zHZonxMtmGsndZkpCpNucun2B2wnZLK TQ6+RdgJfOu1HlEuGGvM7CcJZYJQnNNLLGW0AcDVDsPSmMtzbqMmV6IFMa/TauI591uC JRWi+Hi2cyyqY6T9ShrJQAkPqlxoPnnPnvoPHUyo2e4nEbSEJAJAYOnm7jdjQl0WC7Be 0eZ2igXfwd3CSUvLlWeBisbVTfJkWQ23IXVvnEJiYWLcHmVqniGpQ89ew0irmFZiV92o jpzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693323951; x=1693928751; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=sy7NKuS4tbOX+1DhUrZhrpInHjxMKEDwrcJ1jkkBjHo=; b=jWeEAovuKBdYmHY/ok3D4f4boppALE1iWXUMv5iHA0W5rZ6RTRK7pp/H2gyM9M/9K3 0yF9c5azYk5q53bMypN0nDKi/Pp5iyYyVdVbUy+6Gc+13A2HSAd0buYXUjJceXfFSy70 xJmyeijvWdnBehFm+BrT4pGeNsdRHFJUi0V5Ps6/J5zJIS6MU4sltGNQJWeh++u5dlra FiEDr6MRtMLr4vENa7I5ievIe2qjPXKqFrXXSrEBhJVzKQjJTiGxVEo8SBRdmBh24kdM q7k1pwZNmWDtzOQFrnsgO6RVW2ztby3GI1SR9Uf/z3FyR8iMNLAY3HIAhsBXI1k51bNp n5nQ== X-Gm-Message-State: AOJu0YzOIzXNh4udoExj87IlTQQfQq214cLiHvCgWDMsHj1RPHc81i0b w9X2AL+cZnkx3UD1rkg/7LGmc70oqFcR5437to8hM18t3aJddg== X-Google-Smtp-Source: AGHT+IE1uDJ+/rS5TreKN4gTEGvm7Xwln87TKsuCaeiO/XgEvRNzNVLi6J1fwIEbYPUDXCBm3KHmsCuLG8V8jGCplAs= X-Received: by 2002:a25:d38c:0:b0:d7a:b6b9:73d8 with SMTP id e134-20020a25d38c000000b00d7ab6b973d8mr3802124ybf.20.1693323950956; Tue, 29 Aug 2023 08:45:50 -0700 (PDT) MIME-Version: 1.0 From: Andrew Scott Date: Tue, 29 Aug 2023 16:45:39 +0100 Message-ID: Subject: 30.0.50; inhibit-eol-conversion breaks revert-buffer To: bug-gnu-emacs@gnu.org Content-Type: multipart/alternative; boundary="0000000000009624bd060411b440" Received-SPF: pass client-ip=2607:f8b0:4864:20::b30; envelope-from=andj.scott@gmail.com; helo=mail-yb1-xb30.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, HTML_MESSAGE=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-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit X-Mailman-Approved-At: Wed, 30 Aug 2023 03:18:37 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) --0000000000009624bd060411b440 Content-Type: text/plain; charset="UTF-8" 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) I couldn't reproduce this on Emacs 28.2 (nixpkgs#emacs) or 29.1 (emacs-overlay#emacs-unstable). In GNU Emacs 30.0.50 (build 1, aarch64-apple-darwin22.6.0, NS appkit-2299.70 Version 13.5.1 (Build 22G90)) Repository revision: 09351df10a1041d58c7236484f96d6999bfe9cb0 Repository branch: master Windowing system distributor 'Apple', version 10.3.2299 System Description: macOS 13.5.1 Configured using: 'configure --prefix=/nix/store/37hr4bsvv94zlh8abxs2bylxn2dj0fix-emacs-git-20230826.0 --disable-build-details --with-modules --disable-ns-self-contained --with-ns --with-native-compilation --with-tree-sitter' Configured features: ACL GLIB GMP GNUTLS JPEG JSON LIBXML2 MODULES NATIVE_COMP NOTIFY KQUEUE NS PDUMPER PNG RSVG SQLITE3 THREADS TIFF TOOLKIT_SCROLL_BARS TREE_SITTER WEBP ZLIB Important settings: value of $EMACSNATIVELOADPATH: /Users/a/.cache/emacs/eln-cache value of $LC_COLLATE: C value of $LANG: en_GB.UTF-8 locale-coding-system: utf-8-unix Major mode: ELisp/d Minor modes in effect: tooltip-mode: t global-eldoc-mode: t eldoc-mode: t show-paren-mode: t electric-indent-mode: t mouse-wheel-mode: t tool-bar-mode: t menu-bar-mode: t file-name-shadow-mode: t global-font-lock-mode: t font-lock-mode: t blink-cursor-mode: t line-number-mode: t indent-tabs-mode: t transient-mark-mode: t auto-composition-mode: t auto-encryption-mode: t auto-compression-mode: t Load-path shadows: None found. Features: (shadow sort mail-extr emacsbug message mailcap yank-media puny dired dired-loaddefs rfc822 mml mml-sec password-cache epa derived epg rfc6068 epg-config gnus-util time-date mm-decode mm-bodies mm-encode mail-parse rfc2231 mailabbrev gmm-utils mailheader sendmail rfc2047 rfc2045 ietf-drums mm-util mail-prsvr mail-utils compile text-property-search comint ansi-osc ansi-color ring comp comp-cstr warnings icons subr-x rx cl-seq cl-macs gv cl-extra help-mode bytecomp byte-compile vc-git diff-mode easy-mmode vc-dispatcher cl-loaddefs cl-lib rmc iso-transl tooltip cconv eldoc paren electric uniquify ediff-hook vc-hooks lisp-float-type elisp-mode mwheel term/ns-win ns-win ucs-normalize mule-util term/common-win touch-screen tool-bar dnd fontset image regexp-opt fringe tabulated-list replace newcomment text-mode lisp-mode prog-mode register page tab-bar menu-bar rfn-eshadow isearch easymenu timer select scroll-bar mouse jit-lock font-lock syntax font-core term/tty-colors frame minibuffer nadvice seq simple cl-generic indonesian philippine cham georgian utf-8-lang misc-lang vietnamese tibetan thai tai-viet lao korean japanese eucjp-ms cp51932 hebrew greek romanian slovak czech european ethiopic indian cyrillic chinese composite emoji-zwj charscript charprop case-table epa-hook jka-cmpr-hook help abbrev obarray oclosure cl-preloaded button loaddefs theme-loaddefs faces cus-face macroexp files window text-properties overlay sha1 md5 base64 format env code-pages mule custom widget keymap hashtable-print-readable backquote threads kqueue cocoa ns multi-tty make-network-process native-compile emacs) Memory information: ((conses 16 153137 16869) (symbols 48 8291 0) (strings 32 26303 2093) (string-bytes 1 843959) (vectors 16 18856) (vector-slots 8 366824 13619) (floats 8 29 52) (intervals 56 16278 0) (buffers 992 15)) --0000000000009624bd060411b440 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
It appears that inhibit-eol-conversion breaks insert-file-= contents's
replace functionality when a change was made in the middl= e 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 b= ug.el with
contents:

=C2=A0 =C2=A0 ;; 1. Launch Emacs: nix run em= acs-overlay#emacs-git -- bug.el -Q --load bug.el
=C2=A0 =C2=A0 ;; 2. Out= side of Emacs, add text in below empty line:
=C2=A0 =C2=A0 ;; 3. In Emac= s, revert-buffer

=C2=A0 =C2=A0 (setq inhibit-eol-conversion t)
The contents of the buffer after revert-buffer:

=C2=A0 =C2=A0 ;; 1= . Launch Emacs: nix run emacs-overlay#emacs-git -- bug.el -Q --load bug.el<= br>=C2=A0 =C2=A0 ;; 2. Outside of Emacs, add text in below empty line:
= =C2=A0 =C2=A0 ;; 3. In Emacs, revert-buffer
=C2=A0 =C2=A0 foo
=C2=A0 = =C2=A0 (setq inhibit-eol-conversion t)

=C2=A0 =C2=A0 (setq inhibit-e= ol-conversion t)

I couldn't reproduce this on Emacs 28.2 (nixpkg= s#emacs) or 29.1
(emacs-overlay#emacs-unstable).

In GNU Emacs 30.= 0.50 (build 1, aarch64-apple-darwin22.6.0, NS
appkit-2299.70 Version 13.= 5.1 (Build 22G90))
Repository revision: 09351df10a1041d58c7236484f96d699= 9bfe9cb0
Repository branch: master
Windowing system distributor '= Apple', version 10.3.2299
System Description: =C2=A0macOS 13.5.1
=
Configured using:
=C2=A0'configure
=C2=A0--prefix=3D/nix/stor= e/37hr4bsvv94zlh8abxs2bylxn2dj0fix-emacs-git-20230826.0
=C2=A0--disable-= build-details --with-modules --disable-ns-self-contained
=C2=A0--with-ns= --with-native-compilation --with-tree-sitter'

Configured featur= es:
ACL GLIB GMP GNUTLS JPEG JSON LIBXML2 MODULES NATIVE_COMP NOTIFY KQU= EUE
NS PDUMPER PNG RSVG SQLITE3 THREADS TIFF TOOLKIT_SCROLL_BARS TREE_SI= TTER
WEBP ZLIB

Important settings:
=C2=A0 value of $EMACSNATIV= ELOADPATH: /Users/a/.cache/emacs/eln-cache
=C2=A0 value of $LC_COLLATE: = C
=C2=A0 value of $LANG: en_GB.UTF-8
=C2=A0 locale-coding-system: utf= -8-unix

Major mode: ELisp/d

Minor modes in effect:
=C2=A0 = tooltip-mode: t
=C2=A0 global-eldoc-mode: t
=C2=A0 eldoc-mode: t
= =C2=A0 show-paren-mode: t
=C2=A0 electric-indent-mode: t
=C2=A0 mouse= -wheel-mode: t
=C2=A0 tool-bar-mode: t
=C2=A0 menu-bar-mode: t
=C2= =A0 file-name-shadow-mode: t
=C2=A0 global-font-lock-mode: t
=C2=A0 f= ont-lock-mode: t
=C2=A0 blink-cursor-mode: t
=C2=A0 line-number-mode:= t
=C2=A0 indent-tabs-mode: t
=C2=A0 transient-mark-mode: t
=C2=A0= auto-composition-mode: t
=C2=A0 auto-encryption-mode: t
=C2=A0 auto-= compression-mode: t

Load-path shadows:
None found.

Feature= s:
(shadow sort mail-extr emacsbug message mailcap yank-media puny dired=
dired-loaddefs rfc822 mml mml-sec password-cache epa derived epg rfc606= 8
epg-config gnus-util time-date mm-decode mm-bodies mm-encode mail-pars= e
rfc2231 mailabbrev gmm-utils mailheader sendmail rfc2047 rfc2045
ie= tf-drums mm-util mail-prsvr mail-utils compile text-property-search
comi= nt ansi-osc ansi-color ring comp comp-cstr warnings icons subr-x rx
cl-s= eq cl-macs gv cl-extra help-mode bytecomp byte-compile vc-git
diff-mode = easy-mmode vc-dispatcher cl-loaddefs cl-lib rmc iso-transl
tooltip cconv= eldoc paren electric uniquify ediff-hook vc-hooks
lisp-float-type elisp= -mode mwheel term/ns-win ns-win ucs-normalize
mule-util term/common-win = touch-screen tool-bar dnd fontset image
regexp-opt fringe tabulated-list= replace newcomment text-mode lisp-mode
prog-mode register page tab-bar = menu-bar rfn-eshadow isearch easymenu
timer select scroll-bar mouse jit-= lock font-lock syntax font-core
term/tty-colors frame minibuffer nadvice= seq simple cl-generic
indonesian philippine cham georgian utf-8-lang mi= sc-lang vietnamese
tibetan thai tai-viet lao korean japanese eucjp-ms cp= 51932 hebrew greek
romanian slovak czech european ethiopic indian cyrill= ic chinese
composite emoji-zwj charscript charprop case-table epa-hookjka-cmpr-hook help abbrev obarray oclosure cl-preloaded button loaddefstheme-loaddefs faces cus-face macroexp files window text-properties
ov= erlay sha1 md5 base64 format env code-pages mule custom widget keymap
ha= shtable-print-readable backquote threads kqueue cocoa ns multi-tty
make-= network-process native-compile emacs)

Memory information:
((conse= s 16 153137 16869) (symbols 48 8291 0) (strings 32 26303 2093)
=C2=A0(st= ring-bytes 1 843959) (vectors 16 18856)
=C2=A0(vector-slots 8 366824 136= 19) (floats 8 29 52) (intervals 56 16278 0)
=C2=A0(buffers 992 15)) --0000000000009624bd060411b440-- From debbugs-submit-bounces@debbugs.gnu.org Wed Aug 30 09:27:15 2023 Received: (at 65609) by debbugs.gnu.org; 30 Aug 2023 13:27:15 +0000 Received: from localhost ([127.0.0.1]:52422 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qbLE3-0002Bs-2O for submit@debbugs.gnu.org; Wed, 30 Aug 2023 09:27:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34550) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qbLDz-0002Be-Mn for 65609@debbugs.gnu.org; Wed, 30 Aug 2023 09:27:14 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qbLDl-00049i-5W; Wed, 30 Aug 2023 09:26:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-version:References:Subject:In-Reply-To:To:From: Date; bh=77LjO670aYiaNn5ji0DIsKIk2j0sv6LB2qTcQHtG6JI=; b=f3mEjN1aysirByyOBaUT +MgY1TGUEIVMWrBdyPME2WLlmaZq3d5Sj6ibfaDCU2cdOAOl0odOB6+2va4muUJSw/E4BVtK726cx QjinAQ0OkIIDziTVU8e8XseiVoP2lvc2EJh7TlQf+pc7tZpTTPeQWs54HtmaS9p9IENV/nQeRCxnn 3krnYgpgrIW32oU417HMsCJ4sng1pRnVB7knda5mFQYHnoSG9DEhBwuk+JDbWYuuCJP4vhTZJccF2 4DnyLo4GpZPGEoYGMuGzsCyhlg5K93+6/8sZjDZ0YEzNwB6CRbgFRshVvcofECT4p2EidqLu9peV3 RLmS4AmGUrHwfg==; Date: Wed, 30 Aug 2023 16:26:35 +0300 Message-Id: <837cpchd9w.fsf@gnu.org> From: Eli Zaretskii To: Andrew Scott , Po Lu , Gerd =?utf-8?Q?M=C3=B6llmann?= , "Herbert J. Skuhra" In-Reply-To: (message from Andrew Scott on Tue, 29 Aug 2023 16:45:39 +0100) Subject: Re: bug#65609: 30.0.50; inhibit-eol-conversion breaks revert-buffer References: MIME-version: 1.0 Content-type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 65609 Cc: 65609@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > From: Andrew Scott > 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)) From debbugs-submit-bounces@debbugs.gnu.org Wed Aug 30 09:43:08 2023 Received: (at 65609) by debbugs.gnu.org; 30 Aug 2023 13:43:08 +0000 Received: from localhost ([127.0.0.1]:52437 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qbLTQ-0002Y6-89 for submit@debbugs.gnu.org; Wed, 30 Aug 2023 09:43:08 -0400 Received: from mail-lj1-x22d.google.com ([2a00:1450:4864:20::22d]:54572) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qbLTL-0002XY-8t for 65609@debbugs.gnu.org; Wed, 30 Aug 2023 09:43:06 -0400 Received: by mail-lj1-x22d.google.com with SMTP id 38308e7fff4ca-2bce552508fso84900291fa.1 for <65609@debbugs.gnu.org>; Wed, 30 Aug 2023 06:42:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693402969; x=1694007769; darn=debbugs.gnu.org; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=azTX3NNnuXVti1J3cfYNxesKpXnozBa13ERw0uDsDHw=; b=nABcynO1n152d1d3xCigNANMizUW16mTnqa9CWkotWjhQ1qLe2wSuTFhf3IAkFQw34 wAFQLaLOGxqp0JPi2FZ4RrdAS6ptQlOTBipPHOC0BbSZqH5S5zZmmDQ7V0vHBdc8r1y5 GD1ivzB3U2PP1ky5zUJkILNUqnxag6X/1ddoK8NuPQMPZ9G+oQEiyo4e3VwwZeXxcgaa y+AqCHS51rqjvW0j52YKNKG58g6IEvDKVBr0cE6e6W+EGlYbs8AHKRBOyorro9qb7kmj TuKKTNr5p1DUpsHB+FZTl/jolyRLCg5lbLO9vCyRPtULvbVNOMcfEyDCjCicFU2V9Mx3 nVgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693402969; x=1694007769; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=azTX3NNnuXVti1J3cfYNxesKpXnozBa13ERw0uDsDHw=; b=XBwMmj7EyLlxXG2J1SxVVig9iTwvP3+zBSYQHHe4QD1F7hbxt03aIg86RZeSWZ80kk 4yVI6WDDFRYzlZLA9u8CIRigqaDGUsbmvuvzHdwx9Dny6WiSQI0XylqJRH5XXfm0AN8M fQ7KZc/lsO+ax9UtuLALF/09NaPvEH75vv/i89+NGktKoY+3HzEqH5JXVyWoR9d3CmOO tgmWmqPjaYZXfctwqtrzgso5eWzRYI/7YY/3JxIAAmiZ3Hr8/HxV/hA4EVmW2++qbZUb 4xe3MsEoDeYaYwf5UC+p4+U7fXXLTDnbPux7wF0EMzT1mO3TAWVvo7025HFus66GX5QC 9Bug== X-Gm-Message-State: AOJu0Yzr41N48l1C0F8tz9aAVY3T/nM2QiFeTsJ1F6HoUvp694ym37+I Gvrl6hpWFcimGFZnz09PXRY= X-Google-Smtp-Source: AGHT+IE5er9/hlClugSm94VEadHzxuWFvNHH8PXbYFwdcW/OJIShJ/HlEAwSWgFx2R3d+zsotxIC/Q== X-Received: by 2002:a2e:a171:0:b0:2bb:9710:9d89 with SMTP id u17-20020a2ea171000000b002bb97109d89mr2074429ljl.10.1693402969340; Wed, 30 Aug 2023 06:42:49 -0700 (PDT) Received: from [192.168.178.21] (p4fe3acd3.dip0.t-ipconnect.de. [79.227.172.211]) by smtp.gmail.com with ESMTPSA id b5-20020a1709065e4500b0099bcbaa242asm7173791eju.9.2023.08.30.06.42.48 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 30 Aug 2023 06:42:49 -0700 (PDT) Message-ID: Date: Wed, 30 Aug 2023 15:42:48 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.14.0 Subject: Re: bug#65609: 30.0.50; inhibit-eol-conversion breaks revert-buffer Content-Language: en-US To: Eli Zaretskii , Andrew Scott , Po Lu , "Herbert J. Skuhra" References: <837cpchd9w.fsf@gnu.org> From: =?UTF-8?Q?Gerd_M=c3=b6llmann?= In-Reply-To: <837cpchd9w.fsf@gnu.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -1.0 (-) X-Debbugs-Envelope-To: 65609 Cc: 65609@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.0 (--) On 30.08.23 15:26, Eli Zaretskii wrote: > 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)) With this patch, the abort during bootstrap no longer happens. Thanks! That was quick ;-). From debbugs-submit-bounces@debbugs.gnu.org Wed Aug 30 09:43:54 2023 Received: (at 65609) by debbugs.gnu.org; 30 Aug 2023 13:43:55 +0000 Received: from localhost ([127.0.0.1]:52441 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qbLUA-0002Z5-KO for submit@debbugs.gnu.org; Wed, 30 Aug 2023 09:43:54 -0400 Received: from sonic306-21.consmr.mail.ne1.yahoo.com ([66.163.189.83]:35525) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qbLU8-0002Yr-Az for 65609@debbugs.gnu.org; Wed, 30 Aug 2023 09:43:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1693403019; bh=6AfBMlJ49Mz6EP7s/mmWTktZZq1AvVNBq57uJkFecCU=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From:Subject:Reply-To; b=RxxOYEh4FUyTN0FrwObevWSKm94DA20Ywka6gg84khBiNwcm/tXj8pgtV0uH3xWCseydRxyW+EAR26/kGpfAOiRfC6SKvWvqC7APwasplkxiQ0k/OHXvel6+Q9rdMQEaeHpWZN7Rukqe2sdwEH7H9o2/T/OsXc3qLvGFuqLfa514YeAHGyNErQLJq6hITlz5GxttkU9NBbjcmTSJbjBkIYcRlS4AALvj9XgYGjQ5CkJ1l9AUQXaZOeNdk9Q0aCRqydliupTSyXGYodTPOMKjoMU2DJKz7pMFYzPXS+2J9Yur6GIWwINMHExD00bDw03WzP27vjV6N52Hk599SxzwJg== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1693403019; bh=QofapyQYaItvP+blVKTcjFZc1R4Ckb2g0+C74NhctK0=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=Q1HOeCoSddLGY7miBMtxJnsITz6Yx+TFv77Qo8II1cF2IBamTBfM0lAaOZXxCUdAentxjaGtdvUhs7gLjKeYiQrimCWz/MRoupnV4KKKrimi8f0y5lTcR3XDG9jGGukreMpSszR6lU0VJ69QYx74t1BruhcH3iqOgQwwDgPIkaWGGfvR4weRw5BVFZksgLs7IZGTE/DjONQOvw+P6iCE8/knIRMs6kE5s5n5Fxl70aZmni88if1nmbglAGj87Jqpr/p2+6h0q174lNoGQ7VusJo1AE++gH+2CtdH4b1KdiZnheDefOtGms6KQneSPCfbSObLieAJzGx6WzMDflC/MQ== X-YMail-OSG: y14ONcAVM1mr7yPT3ZmpJ1fZ2y5K6Jy0_eEpHD_C5En0v4AV2UXa5hk6SJz2wT8 QHVaD2F4a.0TXx9dR0.ek0.pRTrxV_Nz6WTemorFNyPihpsExTwRvgfK1XT9hbfENl4rI8hR6Vcv ypZogvSgtQEsepvZWxGYiPB.QPT3xvys9_dMUW2zeqdSCitMJo.Vn0b0dETfuef8kGKaxCSVQu7o MbmlQXIJ1cpV5BtonX5ZVu3Tmd.1RoKOunoqDGHvyWd2GPumbFwoxJQ.JdLtLvDc9DmqSqow_EeZ lTPzv9XgDbx.3AQZj_HGrJcRdEpKkufVRKrDufcyYtTETZsOHFONoEPqDfVDDPoVjnv8xBIFl8PA O14GDqRtMKbpBIQy9rpHfYFrni6BZx9Cy06jmPelGHvNciCFRF_6cO8csBEH3itPpTiXnRaReUmt p7hgdxz2SVqcZg9J7XjyIQEB9Nme43aeWzNNKTJejnqbae36fHQIxmo3s5a5lt.IFWtjWamVQy0J jlvMdOiIPpLag4Gqniemt64ijUjmUWHnDSIv40Vmncv0uuzRuOEWmuCPu26XM36.G4JL9BNV7lh1 VjEpSOIUrqtw7h2GLLJbqxIrR9rSPFEWdx1YfIZBFmYyO2U3QmU3A8svK0hS9nKST5ngpUZwLgXu Si_TfXWOI.MH3tjq59PQ1IsiURrC19FYAWxU0gUJD25hedZd99whnxgp3WwYpWWKxc1QUm4cjrFt 3LJj6ut70YQIgXRfhKrmj_jWRn6MzqaVqqhZuwh1zvHFSWNafkKTD.yQGtulEMNRnS4JyU4hPYuF IZPWdoWA0CWE4xP7VchWlNh28CfEA3WeY6TzleecBz4GdnhlyyE728qb3CUceYyiJzLHG2Ub1k1n ljCKkoqoWfuOQmV1mKlkH8NCv0xirQXrfSZf5R7LelRMut4chkS4AYFsAF6RSzylA6aT8rZ6S5cc eetD0Ra8GzKQ36hWGVhZb00UYqq5nKyc2z9U1T7ImFEOGwQefJLovdxrWCW6WFXDmirqwfW76_hy tP9KB2PwRgnZBVb9XAbdRm0Kw.QVWIvCxP3YNDBDiiDC4Sj__1Afr8dBQ317KNpeHRVNmU1sYt02 yxnK51BkeuWukRd.bI7eAf6AOa4x088QX9NQixyR_8KGPnUcrJj75oxHQ3YqtXfrOh27Ll0qUPMs LDF_xmx__iQvxoygxejpqIp0U8eqZyjPeDXGAHpfCSvy1qnTekdezibrfCLVJMpjR5mBIHKwSoJe 8w9Xoe5YXioSGOf7.fTzHL4b7q6TKIaMbRsQIIXSNU5NZkXT843o.3lcKWd2gzyMlbJ9am8_JzFV 6pAmgS67VqRUf2vm38USur7DjqEmyFjQTGfdCGthSNGV6Vm9NBUEwumV04ks6LZb0DJSebHYwb5h 7OfatPPdpt3336MSeUzHIU3VIYCOYXx.sSapouhUJD0qzwQ0KqDMKCXGDKQLIkc714TWOa1Yy5bH yFBi6s8gfer6AV.0Gman5eNn6jXXOYxuf3r3NITfQLDJJ64tOI7tgBEihGboGjptQCCvulApPAaD 6aj32AhIhF4qbHiV3VRHdanZyLM5NR4mozvuJsKPlD9ENGUCjM2lUkqK5FewGFn9R7_XxfSoQTB4 RtXfCYB.tNMgBnNGV4RGcEwRn4couALzr5VqF8v1x1FvQhaNpB8wLTiBL9Wxl22VX6p36NyeOljw WBOsgybvr9mpegrgVUcgOwOJtTgDylxYaLADU5z8IizNQr7EVut5H_uERyMsGntKjZutfsWzqqt0 rPpXxhoYy.zYsdxj086aH84qcBx9f2js99zVZ5xjhIYHXiJHnL1oTWBBk_J2gyubIrzyJ0GJdxea 79fY_zumpq17JGfs2.ISziKcYRZDY.lhMODR9oBGN25Wh8qMSpDfjrbz6m_qbr2V4MqEZLOShpAd oNpysvwbcJeq0UN4NAZJ1IiQai6VABiYyqkLxftb6UGyeAsiYkpwHLfLBQ6H5VXJurd7Ia9GG0At lNstkze.6AV5dRYYxd6I7W1w4.pvkqCT6gax8CKvQqL8KTiJmtbWwJdt7a20Mlugg2HLzeuPC6W9 ziqhVe2GLy1_q4ygP.iZjaO2LNQagUAkxTY8oGc9bCuhft72D1OssR.YvdeB3NcDxAGPHfkmOeCm mZbg93xOiCY707O3pX3dEG3oV.MHWvvj5uj5InOxA.C8uoiMGE1.NGM6WdJYWzXJgESjNJTesxgZ KNzni2A8IM1No_QsqXcXcrJ.oporacUN12ZKDrMejdQyrUzCF8yBQwRpl_CBpOPqCWbE- X-Sonic-MF: X-Sonic-ID: 6405c40d-7472-42aa-9c83-ff6e8602750e Received: from sonic.gate.mail.ne1.yahoo.com by sonic306.consmr.mail.ne1.yahoo.com with HTTP; Wed, 30 Aug 2023 13:43:39 +0000 Received: by hermes--production-sg3-69654d8bd-tsbjv (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 3fd42be5af94c2b1020cab89d8139d9d; Wed, 30 Aug 2023 13:43:33 +0000 (UTC) From: Po Lu To: Eli Zaretskii Subject: Re: bug#65609: 30.0.50; inhibit-eol-conversion breaks revert-buffer In-Reply-To: <837cpchd9w.fsf@gnu.org> (Eli Zaretskii's message of "Wed, 30 Aug 2023 16:26:35 +0300") References: <837cpchd9w.fsf@gnu.org> Date: Wed, 30 Aug 2023 21:43:23 +0800 Message-ID: <87v8cwtzlw.fsf@yahoo.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Mailer: WebService/1.1.21763 mail.backend.jedi.jws.acl:role.jedi.acl.token.atz.jws.hermes.yahoo Content-Length: 996 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65609 Cc: Gerd =?utf-8?Q?M=C3=B6llmann?= , "Herbert J. Skuhra" , 65609@debbugs.gnu.org, Andrew Scott X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Eli Zaretskii writes: > 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)) I don't believe this should incur any difficulties upon the Android port, so please proceed with installing it if it works. From debbugs-submit-bounces@debbugs.gnu.org Wed Aug 30 10:19:09 2023 Received: (at 65609) by debbugs.gnu.org; 30 Aug 2023 14:19:09 +0000 Received: from localhost ([127.0.0.1]:53727 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qbM2H-0003mj-0i for submit@debbugs.gnu.org; Wed, 30 Aug 2023 10:19:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60794) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qbM2C-0003mC-0I for 65609@debbugs.gnu.org; Wed, 30 Aug 2023 10:19:07 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qbM1y-0000bK-HV; Wed, 30 Aug 2023 10:18:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-version:References:Subject:In-Reply-To:To:From: Date; bh=1rjA65b5RGL2BzdjNLE/blNTvToeWXXgTxoLm2Cls8U=; b=EmeGwWM+w4KvNpp2RjdF 3ARxEeFH4cfCTYV/UqnNItcwjgyClLO/vrFFzJQpq578OXnvzABmznIeyTTr9wZr/22YnuVJmsFAu xvuKIeDBPIf1oI5TtT44i9lbNTL+sQ3Y0kIt5/lqy7SyjLKngwzoAWMElimKxdcPZdRpSZ6bHj6/S d2kepOXm9eMGoLOC4WlF2Fr+sfs4knD27Vbh9TFv+aoFzHj5sOuzdNsirSWVGxEr17roxjoWTx8S2 gVdMIKILb2zzqinl4TUCzQSROiRBoD/Jf+S8T380aST30pBAE3qu4pUhpAtCJvUj4/P4mz85kjl30 LcaPNkg5P4nlpA==; Date: Wed, 30 Aug 2023 17:18:29 +0300 Message-Id: <831qfkhave.fsf@gnu.org> From: Eli Zaretskii To: Po Lu In-Reply-To: <87v8cwtzlw.fsf@yahoo.com> (message from Po Lu on Wed, 30 Aug 2023 21:43:23 +0800) Subject: Re: bug#65609: 30.0.50; inhibit-eol-conversion breaks revert-buffer References: <837cpchd9w.fsf@gnu.org> <87v8cwtzlw.fsf@yahoo.com> MIME-version: 1.0 Content-type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 65609 Cc: gerd.moellmann@gmail.com, herbert@gojira.at, 65609@debbugs.gnu.org, andj.scott@gmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > From: Po Lu > Cc: Andrew Scott , Gerd Möllmann > , "Herbert J. Skuhra" , > 65609@debbugs.gnu.org > Date: Wed, 30 Aug 2023 21:43:23 +0800 > > Eli Zaretskii writes: > > > 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)) > > I don't believe this should incur any difficulties upon the Android > port, so please proceed with installing it if it works. Thanks, installed on master. I will wait to hear from Andrew before closing the bug. From debbugs-submit-bounces@debbugs.gnu.org Wed Aug 30 10:23:21 2023 Received: (at 65609) by debbugs.gnu.org; 30 Aug 2023 14:23:21 +0000 Received: from localhost ([127.0.0.1]:53737 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qbM6L-0003tf-FA for submit@debbugs.gnu.org; Wed, 30 Aug 2023 10:23:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52568) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qbM6J-0003tT-HP for 65609@debbugs.gnu.org; Wed, 30 Aug 2023 10:23:20 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qbM66-0001iN-6o; Wed, 30 Aug 2023 10:23:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-version:References:Subject:In-Reply-To:To:From: Date; bh=4yX4Dxcy6j06ybs5Og2RnrVHUVzOYyRxgYclet5izgM=; b=K5zl+MDzvSblcot58HA2 PkKYX0OBLlzwWqHGsQ8JcUnHe6HbOa2AXtKlFiMAv0zrOphKzVsi9s+Rn3j4hD1k/LVsNrUhM3YtQ i1EYtDR3jEsVypAuMSKTU7QY0iJBFouDBErwUQoRL97hrEuLcWAfV77UkejfmoS835MlSkl33blLF Dyz6MHvhvE48W8L1HtbM3hV+J4J9Yj/B7RyUc01QP65cRZgHajV9eb6zWUyiqaNvDrsHnJCFJ4FR3 GahKLPXwq4brwD5VwBt74I0jGYB1PE0EWr3it4o6+tAg20v2rBFXSX5FfzhiYrlG/6ki4qW53Sr7z aiW563z6N4SyqQ==; Date: Wed, 30 Aug 2023 17:22:46 +0300 Message-Id: <83wmxcfw3t.fsf@gnu.org> From: Eli Zaretskii To: Gerd =?utf-8?Q?M=C3=B6llmann?= In-Reply-To: (message from Gerd =?utf-8?Q?M=C3=B6llmann?= on Wed, 30 Aug 2023 15:42:48 +0200) Subject: Re: bug#65609: 30.0.50; inhibit-eol-conversion breaks revert-buffer References: <837cpchd9w.fsf@gnu.org> MIME-version: 1.0 Content-type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 65609 Cc: luangruo@yahoo.com, herbert@gojira.at, 65609@debbugs.gnu.org, andj.scott@gmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > Date: Wed, 30 Aug 2023 15:42:48 +0200 > Cc: 65609@debbugs.gnu.org > From: Gerd Möllmann > > On 30.08.23 15:26, Eli Zaretskii wrote: > > 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)) > > With this patch, the abort during bootstrap no longer happens. Thanks for testing. > Thanks! That was quick ;-). It was an easy test case and a stunning failure. From debbugs-submit-bounces@debbugs.gnu.org Wed Aug 30 13:06:36 2023 Received: (at 65609) by debbugs.gnu.org; 30 Aug 2023 17:06:36 +0000 Received: from localhost ([127.0.0.1]:53902 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qbOeJ-0008Ev-Su for submit@debbugs.gnu.org; Wed, 30 Aug 2023 13:06:36 -0400 Received: from mout-u-204.mailbox.org ([80.241.59.204]:47752) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qbOeG-0008Eg-Gw for 65609@debbugs.gnu.org; Wed, 30 Aug 2023 13:06:33 -0400 Received: from smtp102.mailbox.org (smtp102.mailbox.org [IPv6:2001:67c:2050:b231:465::102]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-u-204.mailbox.org (Postfix) with ESMTPS id 4RbW0S5fgPz9sQT; Wed, 30 Aug 2023 19:06:16 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gojira.at; s=MBO0001; t=1693415176; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=VAuy+B21MzgPjX7Q2uOUYSt+taPIm8aXBHGYGzZi6b0=; b=PXx+3/qyDZIfs/snHnbGHT7itKQCtGGshhlAzUtXkdv4p3eOy0od9bxB/pwPGLtI106trv GXWTHF2EAamPBAbPYqVpodgtjYAwp0qUNLuWkX3yMzhELa1xGXhD3Y6UjXqS1V7UjzM1UD C471Wm8h1+7bRyZmsN3kMAwdg8rJ7+U6UxtIzKrsA0/BQWhrlVLItbWj5atqs/41zPl8XB Sa90bUPzTWbvtV9BMsB022pkX1EtDJ0+Ehjby15WhjoVnk2/a0iL3NF6PVSGOMNBnxl5Pa eRrfpSLoND3wK4aJu0Z90fTCaeLdLw3QczGCtcnvTRNP5haqUjdQfAV55kB0eA== Date: Wed, 30 Aug 2023 19:06:14 +0200 Message-ID: <87y1hspiih.wl-herbert@gojira.at> From: "Herbert J. Skuhra" To: Eli Zaretskii Subject: Re: bug#65609: 30.0.50; inhibit-eol-conversion breaks revert-buffer In-Reply-To: <837cpchd9w.fsf@gnu.org> References: <837cpchd9w.fsf@gnu.org> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII X-Rspamd-Queue-Id: 4RbW0S5fgPz9sQT X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 65609 Cc: Po Lu , Gerd =?ISO-8859-1?Q?M=F6llmann?= , 65609@debbugs.gnu.org, Andrew Scott X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) On Wed, 30 Aug 2023 15:26:35 +0200, Eli Zaretskii wrote: > > > From: Andrew Scott > > 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. Thanks. Unfortunately this change does not resolve my issue opening org-files. I still have to revert 4e8d579f3da. -- Herbert From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 02 12:06:00 2023 Received: (at control) by debbugs.gnu.org; 2 Sep 2023 16:06:00 +0000 Received: from localhost ([127.0.0.1]:38281 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qcT8J-0003mA-QT for submit@debbugs.gnu.org; Sat, 02 Sep 2023 12:06:00 -0400 Received: from mail-lf1-x12b.google.com ([2a00:1450:4864:20::12b]:56664) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qcT8H-0003lv-Kx for control@debbugs.gnu.org; Sat, 02 Sep 2023 12:05:58 -0400 Received: by mail-lf1-x12b.google.com with SMTP id 2adb3069b0e04-50098cc8967so177498e87.1 for ; Sat, 02 Sep 2023 09:05:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693670741; x=1694275541; darn=debbugs.gnu.org; h=to:subject:message-id:date:mime-version:from:from:to:cc:subject :date:message-id:reply-to; bh=DOnBkpUP7p2snFisQhCJ9CsLDZJoMfU38UlN+cZqXwI=; b=CZ0eVKd7Iw6J9mt4gpFzB5Ea5vTqSvdzTgPv/vk9n64+kXXTfukYbgvQrP9Sao/Dhm YA+tqqoSpAO83m7eM1AF2cczxrlhlUAdpF+jQYxZm47CDQQY0ZceYihTIKBItZERKTON sE9QmvTRSzSdfW9SNKh4EZIPZGDPQ3gjRuXHM4fw0t63Zl/9MvUeyuvkmTZhYYP9oYeV 6TcqQtV3EvyLSKOKl93TtLkU6bgbkTqxtDoA+xHVzZZCI/2DW5f5TP5feZI7tMNQbPOU VKKOKFpgD/DkibwcH+PznDyN/zoSyvQ8OZYb4GrDvtwh2RykRpclPYMG25R4T0lQSMwP 8pbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693670741; x=1694275541; h=to:subject:message-id:date:mime-version:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=DOnBkpUP7p2snFisQhCJ9CsLDZJoMfU38UlN+cZqXwI=; b=JUGnVzQSCctXbZhDSsRrnSruRdeHo71LYfAqO0+ZeIJW93BlynOX88z02jH4EBuX59 J6pzRQ2lfm0YDPsSXXDRPpTWmeGQ9kz2kEUNaJM+r4ye428KV2JTtj5q/kXVpH9PXKTM cBPt6XUrwWGR73o54U5lDVyd3GoYzf4oEWF0AwDStCGnWByf7+TifFUCtOlxkhOjs/Go /hq2We0REgAy0FRZvNSwG1CXJm2Ao/qLB4t9e1+kvdkOlw1S4UOPAtz4n3Sq/bFWujIX 3ZbF0vkJNU4J9bF2f56s6qHHEA2imxnDxUGwj3u0zLicmF407YAKrXa/n8TN9ADBWwhS /c3Q== X-Gm-Message-State: AOJu0Yxzux09jXk7OWc1DWXCMHJ9t3SKeHz8xWXUxU8WQidjdqL/0UID 1YDUmHe7Aopj9knZ35ONA0Xq1UXE+1R82S6wKhdBngY/euc= X-Google-Smtp-Source: AGHT+IGdU0+xY92pfdoO2Uc+vgqpJqekt9HmSIsxd05nrMlhaaBuANrlXMLt2Gd/MqI9nCcNzCpF4fY8UP2GqmmBnQs= X-Received: by 2002:a19:431c:0:b0:4fb:7b4c:d38c with SMTP id q28-20020a19431c000000b004fb7b4cd38cmr2941911lfa.60.1693670741207; Sat, 02 Sep 2023 09:05:41 -0700 (PDT) Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Sat, 2 Sep 2023 09:05:40 -0700 From: Stefan Kangas MIME-Version: 1.0 Date: Sat, 2 Sep 2023 09:05:40 -0700 Message-ID: Subject: control message for bug #65609 To: control@debbugs.gnu.org Content-Type: text/plain; charset="UTF-8" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) fixed 65609 30.1 quit From debbugs-submit-bounces@debbugs.gnu.org Sun Sep 03 13:18:36 2023 Received: (at 65609) by debbugs.gnu.org; 3 Sep 2023 17:18:36 +0000 Received: from localhost ([127.0.0.1]:46749 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qcqk7-0000UC-Rf for submit@debbugs.gnu.org; Sun, 03 Sep 2023 13:18:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56314) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qcqk6-0000Tu-2Y for 65609@debbugs.gnu.org; Sun, 03 Sep 2023 13:18:34 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qcpOG-00052K-Hi; Sun, 03 Sep 2023 11:51:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=zQ1UKA8IrDoyBKYR7glZJsi3ojZUSnETRCwhYJ9xjmc=; b=Rb658S0w3pxK twAJORGvd66AbLmcVVr21UrZIZxqUMXMYIDE+ac3BS8Jz0JW58BmRbOYHnUZOKwAkzEryK2UiSFag h6iW2tH4RnQgTkw58T7GlTm6V9v4MUPZwW93SayDnaXKptfmCWwdwkGO7KEq/Q6XKN4SmxoegZLGM fW1NLm13HQ80t+P4Z2mbHuuzYQoLSFimZK5fVj1tQ91rDpvgBWywehoAWCv9CWWOObZnwdW6nAk2t YJXpGmI+J8Oqy73Qz8Xnfs56QA8YhkRSXr+t+fIvWC05j3h3BiKXKmsdfv7Ba+llMK/RYbCqS+s/w 33Om8tB2QwN7mCuLgK/utQ==; Date: Sun, 03 Sep 2023 18:51:36 +0300 Message-Id: <83fs3v6yrb.fsf@gnu.org> From: Eli Zaretskii To: Andrew Scott In-Reply-To: (message from Andrew Scott on Sun, 3 Sep 2023 16:16:09 +0100) Subject: Re: bug#65609: 30.0.50; inhibit-eol-conversion breaks revert-buffer References: <837cpchd9w.fsf@gnu.org> <87v8cwtzlw.fsf@yahoo.com> <831qfkhave.fsf@gnu.org> X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 65609 Cc: 65609@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > From: Andrew Scott > Date: Sun, 3 Sep 2023 16:16:09 +0100 > > Amazing. Thank you Thanks, I'm therefore closing this bug. From debbugs-submit-bounces@debbugs.gnu.org Sun Sep 03 14:07:29 2023 Received: (at control) by debbugs.gnu.org; 3 Sep 2023 18:07:29 +0000 Received: from localhost ([127.0.0.1]:46838 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qcrVR-0004Rn-Bd for submit@debbugs.gnu.org; Sun, 03 Sep 2023 14:07:29 -0400 Received: from mail-lf1-x133.google.com ([2a00:1450:4864:20::133]:51711) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qcrVP-0004Ra-BD for control@debbugs.gnu.org; Sun, 03 Sep 2023 14:07:28 -0400 Received: by mail-lf1-x133.google.com with SMTP id 2adb3069b0e04-50079d148aeso1263916e87.3 for ; Sun, 03 Sep 2023 11:07:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693764442; x=1694369242; darn=debbugs.gnu.org; h=to:subject:message-id:date:mime-version:from:from:to:cc:subject :date:message-id:reply-to; bh=v3qIGBQN61BImHKAqwEx9HakyH6KuhidT8VWCUZP4Io=; b=A2i4qsifwj0ba1BSnJw8ncVg3kZE9OZKY77AF4SS+nYbq6dMjH5EcQYDIxAfBee5ce 3aO3uYU4NH4Y4ktNCnL3poD6vPqyRweXcRkbYqc3z0v+ERCvz4z4gSUL6KAl1hzHB7qW PwCG+69sucAetGJST1ubfTnvAIgbfCm+Inx0D2gJ1ZoSwrVONlz8H9LW5y4rr1Bn19Ro cfrkOI6rBw7KqiSWOqRYeOejW/cHNY5G5SvmObfRUDiS0HZ+4ICEVlcnR1N+PtoAEbw6 JqDWiNDFHWXrl3bI9fPm7g3VFLoOvEy+j6ciSZeb2qc5B6mAWJdDInW0Pe4HfHdDHkcG xyBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693764442; x=1694369242; h=to:subject:message-id:date:mime-version:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=v3qIGBQN61BImHKAqwEx9HakyH6KuhidT8VWCUZP4Io=; b=Q+7jseHZx0JkIkQJbmgzD8fC4qKjVnG+QDCscA0Gxodfpz67tiGcAbN9p5YInVFCU7 PcxYPZn0sAIEnQy3ShlBLjkxqNgwY12pjvEYGUQEetvGoxfFrIW13EBanNZ6zzpPfAhU HBgi8Rb3VFJ4O1iq4z8ybu/r7c5pV5MinTnJ2YNT2bF1r2HNkcLS+Hz4I7TM4kae8z8M 0Sw9BrVLNWixXU+DUnNvS0EL13ng3eXWaD9BwjUWlntxLzcsfSt71Y289HPU+2mRadqd V7Ys6LYasLuo3nK8vUr6PyvLgWKAjODSnK7vOiMUKuDWgDM3DTRS0JDhD2mW0IFxQKOT WipA== X-Gm-Message-State: AOJu0YwcWRp0H75ydVrtMS2FjK+s/JXKS6Isd4j6kf0LvvmmS/+A7tRN KvXQbjDc31JKDfXtLtm62uCipIol2wz5joSFHK5mND1TG7M= X-Google-Smtp-Source: AGHT+IFK5un/v6dwc2RMptiiZZZX86MQw+gMz6Fx0e6BcT5efKV93SY7C3w8clHM/0scWnQzv8ZomxM7BkDBl1viXZs= X-Received: by 2002:a19:7b06:0:b0:500:94aa:739c with SMTP id w6-20020a197b06000000b0050094aa739cmr3982575lfc.61.1693764441698; Sun, 03 Sep 2023 11:07:21 -0700 (PDT) Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Sun, 3 Sep 2023 11:07:21 -0700 From: Stefan Kangas MIME-Version: 1.0 Date: Sun, 3 Sep 2023 11:07:21 -0700 Message-ID: Subject: To: control@debbugs.gnu.org Content-Type: text/plain; charset="UTF-8" X-Spam-Score: 2.0 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: close 65609 thanks Content analysis details: (2.0 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (stefankangas[at]gmail.com) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:133 listed in] [list.dnswl.org] 0.0 UNPARSEABLE_RELAY Informational: message has unparseable relay lines 2.0 BLANK_SUBJECT Subject is present but empty X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) close 65609 thanks From unknown Fri Jun 20 07:23:37 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Mon, 02 Oct 2023 11:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator