2 files changed, 9 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index b1575f621e3..a82d2a03af8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-03  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * fileio.c (Finsert_file_contents): Properly handle st_mtime
+        marker for non-existing file.  (Bug#11852)
+
 2012-07-03  Glenn Morris  <rgm@gnu.org>
 
         * lisp.h (Fread_file_name): Restore EXFUN (it's not a normal DEFUN
diff --git a/src/fileio.c b/src/fileio.c
index 942957030e0..820dabff53e 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -4193,7 +4193,10 @@ variable `last-coding-system-used' to the coding system actually used.  */)
 
       if (NILP (handler))
         {
-          current_buffer->modtime = get_stat_mtime (&st);
+          if (st.st_mtime == -1)
+            EMACS_SET_INVALID_TIME (current_buffer->modtime);
+          else
+            current_buffer->modtime = get_stat_mtime (&st);
           current_buffer->modtime_size = st.st_size;
           BVAR (current_buffer, filename) = orig_filename;
         }