From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 1 Nov 2019 06:31:17 +0000 (-0700)
Subject: Fix insert-file-contents file error regression
X-Git-Tag: emacs-27.0.90~791
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3a1e7624ed234bb434cdafed59515cadd037cafa;p=emacs.git

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!eggert@cs.ucla.edu.
---

diff --git a/src/fileio.c b/src/fileio.c
index a3121a26dad..01f8a04e5d9 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);
     }