[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master 3a1e762: Fix insert-file-contents file error regression

From: Paul Eggert
Subject: master 3a1e762: Fix insert-file-contents file error regression
Date: Fri, 1 Nov 2019 02:32:17 -0400 (EDT)

branch: master
commit 3a1e7624ed234bb434cdafed59515cadd037cafa
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    Fix insert-file-contents file error regression
    Problem reported for dired-view-file (Bug#37950).
    * src/fileio.c (Finsert_file_contents): When visiting,
    signal an error if the file could not be opened for any reason,
    rather than signaling an error only for nonexistent files, fixing
    a bug introduced in 2019-09-16T03:17:43!address@hidden.
 src/fileio.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/fileio.c b/src/fileio.c
index a3121a2..01f8a04 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -4806,10 +4806,9 @@ by calling `format-decode', which see.  */)
       unbind_to (count1, Qnil);
-  if (!NILP (visit)
-      && current_buffer->modtime.tv_nsec == NONEXISTENT_MODTIME_NSECS)
+  if (!NILP (visit) && current_buffer->modtime.tv_nsec < 0)
-      /* If visiting nonexistent file, return nil.  */
+      /* Signal an error if visiting a file that could not be opened.  */
       report_file_errno ("Opening input file", orig_filename, save_errno);

reply via email to

[Prev in Thread] Current Thread [Next in Thread]