[Emacs-diffs] /srv/bzr/emacs/emacs-24 r111018: * fileio.c (Fvisited_file_modtime): Return (-1 ...) for nonexistent

[Paul Eggert]

------------------------------------------------------------
revno: 111018
committer: Paul Eggert <address@hidden>
branch nick: emacs-24
timestamp: Mon 2012-12-10 13:58:01 -0800
message:
  * fileio.c (Fvisited_file_modtime): Return (-1 ...) for nonexistent
  
  files, fixing a regression from 24.2.
modified:
  src/ChangeLog
  src/fileio.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-12-10 17:55:03 +0000
+++ b/src/ChangeLog     2012-12-10 21:58:01 +0000
@@ -1,3 +1,8 @@
+2012-12-10  Paul Eggert  <address@hidden>
+
+       * fileio.c (Fvisited_file_modtime): Return (-1 ...) for nonexistent
+       files, fixing a regression from 24.2.
+
 2012-12-08  Jan Djärv  <address@hidden>
 
        * nsterm.m (fd_handler:): FD_ZERO fds (Bug#13103).

=== modified file 'src/fileio.c'
--- a/src/fileio.c      2012-12-04 18:48:01 +0000
+++ b/src/fileio.c      2012-12-10 21:58:01 +0000
@@ -5178,7 +5178,15 @@
   (void)
 {
   if (EMACS_NSECS (current_buffer->modtime) < 0)
-    return make_number (0);
+    {
+      if (EMACS_NSECS (current_buffer->modtime) == NONEXISTENT_MODTIME_NSECS)
+       {
+         /* make_lisp_time won't work here if time_t is unsigned.  */
+         return list4 (make_number (-1), make_number (65535),
+                       make_number (0), make_number (0));
+       }
+      return make_number (0);
+    }
   return make_lisp_time (current_buffer->modtime);
 }