diff options
| author | Paul Eggert | 2012-12-10 13:58:01 -0800 |
|---|---|---|
| committer | Paul Eggert | 2012-12-10 13:58:01 -0800 |
| commit | 184246dffc551d4e84b4b716a2952a0fbd475bf1 (patch) | |
| tree | 2d3a155724dc997231f9577b4fdcb4415a01e102 | |
| parent | 78f9ea875a65686b5e300d73dbf22dd96ca29851 (diff) | |
| download | emacs-184246dffc551d4e84b4b716a2952a0fbd475bf1.tar.gz emacs-184246dffc551d4e84b4b716a2952a0fbd475bf1.zip | |
* fileio.c (Fvisited_file_modtime): Return (-1 ...) for nonexistent
files, fixing a regression from 24.2.
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/fileio.c | 10 |
2 files changed, 14 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 9d9c1fdaff5..c66d917f94f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2012-12-10 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | * fileio.c (Fvisited_file_modtime): Return (-1 ...) for nonexistent | ||
| 4 | files, fixing a regression from 24.2. | ||
| 5 | |||
| 1 | 2012-12-08 Jan Djärv <jan.h.d@swipnet.se> | 6 | 2012-12-08 Jan Djärv <jan.h.d@swipnet.se> |
| 2 | 7 | ||
| 3 | * nsterm.m (fd_handler:): FD_ZERO fds (Bug#13103). | 8 | * nsterm.m (fd_handler:): FD_ZERO fds (Bug#13103). |
diff --git a/src/fileio.c b/src/fileio.c index 77700ff5a5f..49a6740d93a 100644 --- a/src/fileio.c +++ b/src/fileio.c | |||
| @@ -5178,7 +5178,15 @@ See Info node `(elisp)Modification Time' for more details. */) | |||
| 5178 | (void) | 5178 | (void) |
| 5179 | { | 5179 | { |
| 5180 | if (EMACS_NSECS (current_buffer->modtime) < 0) | 5180 | if (EMACS_NSECS (current_buffer->modtime) < 0) |
| 5181 | return make_number (0); | 5181 | { |
| 5182 | if (EMACS_NSECS (current_buffer->modtime) == NONEXISTENT_MODTIME_NSECS) | ||
| 5183 | { | ||
| 5184 | /* make_lisp_time won't work here if time_t is unsigned. */ | ||
| 5185 | return list4 (make_number (-1), make_number (65535), | ||
| 5186 | make_number (0), make_number (0)); | ||
| 5187 | } | ||
| 5188 | return make_number (0); | ||
| 5189 | } | ||
| 5182 | return make_lisp_time (current_buffer->modtime); | 5190 | return make_lisp_time (current_buffer->modtime); |
| 5183 | } | 5191 | } |
| 5184 | 5192 | ||