From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Monnier via "Bug reports for GNU Emacs, the Swiss army knife of text editors" Newsgroups: gmane.emacs.bugs Subject: bug#68546: 29.1.90; end-of-file has incorrect data when signaled within a load Date: Thu, 17 Oct 2024 13:57:29 -0400 Message-ID: References: <86il2nv9xp.fsf@gnu.org> Reply-To: Stefan Monnier Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="10102"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: dmitry@gutov.dev, Eli Zaretskii , 68546@debbugs.gnu.org To: Spencer Baugh Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Thu Oct 17 19:58:05 2024 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 1t1UlA-0002Rw-M1 for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 17 Oct 2024 19:58:05 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t1Ukp-0008Tj-AE; Thu, 17 Oct 2024 13:57:43 -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 1t1Ukn-0008N5-S8 for bug-gnu-emacs@gnu.org; Thu, 17 Oct 2024 13:57:41 -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 1t1Ukn-00045r-Ho for bug-gnu-emacs@gnu.org; Thu, 17 Oct 2024 13:57:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:References:In-Reply-To:From:To:Subject; bh=OHLUS2A29ThDazofXOjFz41VqSGvPnLnIXIGyPKQDcM=; b=jKUeTUx1WC/aT2y9cx8qtJLy9RbbyH7AT/ZKHr3+22sI9BOnef6GJk5gaTCwFVYPng5WdLgEhGuLAvUY76ErfU0nM3UvhT1mkcmNzRtPy9vngK3i/Q4w1lF5n4EE8D1Ck1i+U7raCTwESNxn8eVo5Wf7ZQa4RpTuAWwGP/bAZNIZbCd9LaMGewhEPgmQe7PrCEWiG74b6jLgAl9I/DIdHAp4CfFLWp2xvkf9JHtmenfURqDkuAyZ68qH+6YyHU1JhWFoxfd0pRsq9ezBpCoyywJO5xle0df73u+clR2lNur7/68UmK42I1H0BpHGqoXg0IhT65kMFqGSa5K1wDgoOw==; Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t1Ul8-00044L-Ez for bug-gnu-emacs@gnu.org; Thu, 17 Oct 2024 13:58:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 17 Oct 2024 17:58:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68546 X-GNU-PR-Package: emacs Original-Received: via spool by 68546-submit@debbugs.gnu.org id=B68546.172918788115635 (code B ref 68546); Thu, 17 Oct 2024 17:58:02 +0000 Original-Received: (at 68546) by debbugs.gnu.org; 17 Oct 2024 17:58:01 +0000 Original-Received: from localhost ([127.0.0.1]:35531 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t1Ul7-000446-E8 for submit@debbugs.gnu.org; Thu, 17 Oct 2024 13:58:01 -0400 Original-Received: from mailscanner.iro.umontreal.ca ([132.204.25.50]:20844) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t1Ul4-00043r-A6 for 68546@debbugs.gnu.org; Thu, 17 Oct 2024 13:57:58 -0400 Original-Received: from pmg1.iro.umontreal.ca (localhost.localdomain [127.0.0.1]) by pmg1.iro.umontreal.ca (Proxmox) with ESMTP id B116F100055; Thu, 17 Oct 2024 13:57:31 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=iro.umontreal.ca; s=mail; t=1729187850; bh=wb5SyZ6M2bBU9ZLtRSesLAQoilIwaMpq3ljFD0o2zqM=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=hpjogX1oSreJWS/g6BxWZvQ+U7JSptqykjju9yM3RANlZQEO08mJVujiaafFzzBeS TR7Y6C/eKzMTOTdk4kJoYIha3mroDTUwt4JB/ux6lUUiDbY42yzIVHVM92aiBJ1I64 Cttmyo/2/LY1ozvK1TtTFJ348CRWgZ+VoOfzO3U0OsDrxfyN84vlXzRbX1DboF30gu fIdSLtI7DAIgd8KoWXX/MwaobrfmBP6EEMIC9/pGkX3tG5pRp/Y95EByKkdH4nzG4W Aenl0BPEUSsq5OIvU/kd+ejE4Gk9NVnLFuS+yLGoqpa05xmJYN7l0f8gBbAPU9ZZWB /B2taeewb1Mrg== Original-Received: from mail01.iro.umontreal.ca (unknown [172.31.2.1]) by pmg1.iro.umontreal.ca (Proxmox) with ESMTP id E2216100042; Thu, 17 Oct 2024 13:57:30 -0400 (EDT) Original-Received: from alfajor (unknown [23.233.149.155]) by mail01.iro.umontreal.ca (Postfix) with ESMTPSA id B913412041B; Thu, 17 Oct 2024 13:57:30 -0400 (EDT) In-Reply-To: (Spencer Baugh's message of "Tue, 15 Oct 2024 15:16:00 -0400") 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:293741 Archived-At: > diff --git a/src/lread.c b/src/lread.c > index 95c6891c205..ec0c68e1843 100644 > --- a/src/lread.c > +++ b/src/lread.c > @@ -2329,8 +2329,8 @@ readevalloop_1 (int old) > static AVOID > end_of_file_error (void) > { > - if (STRINGP (Vload_true_file_name)) > - xsignal1 (Qend_of_file, Vload_true_file_name); > + if (!NILP (Vread_end_of_file_data)) > + xsignal1 (Qend_of_file, Vread_end_of_file_data); Hmm... why call it `Vread_end_of_file_name`? How 'bout something like `read--source`? I suspect it could be useful to include similar info in other read errors than `Qend_of_file`. Also it could make sense to allow that var to indicate when we're reading from a buffer (rather than a file). > xsignal0 (Qend_of_file); > } > @@ -2434,6 +2434,8 @@ readevalloop (Lisp_Object readcharfun, > while (continue_reading_p) > { > specpdl_ref count1 = SPECPDL_INDEX (); > + if (NILP (Vread_end_of_file_data)) > + specbind (Qread_end_of_file_name, Vload_true_file_name); Why the `if` condition here? Sounds like it could lead to problems for nested loads and such. Stefan