From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Po Lu via "Bug reports for GNU Emacs, the Swiss army knife of text editors" Newsgroups: gmane.emacs.bugs Subject: bug#65609: 30.0.50; inhibit-eol-conversion breaks revert-buffer Date: Wed, 30 Aug 2023 21:43:23 +0800 Message-ID: <87v8cwtzlw.fsf@yahoo.com> References: <837cpchd9w.fsf@gnu.org> Reply-To: Po Lu Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="12790"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: Gerd =?UTF-8?Q?M=C3=B6llmann?= , "Herbert J. Skuhra" , 65609@debbugs.gnu.org, Andrew Scott To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Wed Aug 30 15:44:10 2023 Return-path: Envelope-to: geb-bug-gnu-emacs@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 1qbLUP-000394-DQ for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 30 Aug 2023 15:44:09 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qbLUC-0005XW-T1; Wed, 30 Aug 2023 09:43:56 -0400 Original-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 1qbLUA-0005Wt-Rs for bug-gnu-emacs@gnu.org; Wed, 30 Aug 2023 09:43:54 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qbLUA-0008Pq-JY for bug-gnu-emacs@gnu.org; Wed, 30 Aug 2023 09:43:54 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qbLUI-0002Zf-3z for bug-gnu-emacs@gnu.org; Wed, 30 Aug 2023 09:44:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Po Lu Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 30 Aug 2023 13:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65609 X-GNU-PR-Package: emacs Original-Received: via spool by 65609-submit@debbugs.gnu.org id=B65609.16934030359867 (code B ref 65609); Wed, 30 Aug 2023 13:44:02 +0000 Original-Received: (at 65609) by debbugs.gnu.org; 30 Aug 2023 13:43:55 +0000 Original-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 Original-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 IZPWdoWA0CWE4xP7VchWlNh28CfEA3WeY6TzleecBz X-Sonic-MF: X-Sonic-ID: 6405c40d-7472-42aa-9c83-ff6e8602750e Original-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 Original-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) In-Reply-To: <837cpchd9w.fsf@gnu.org> (Eli Zaretskii's message of "Wed, 30 Aug 2023 16:26:35 +0300") X-Mailer: WebService/1.1.21763 mail.backend.jedi.jws.acl:role.jedi.acl.token.atz.jws.hermes.yahoo X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:268711 Archived-At: 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.