diff options
| author | Paul Eggert | 2012-07-04 10:11:11 -0700 |
|---|---|---|
| committer | Paul Eggert | 2012-07-04 10:11:11 -0700 |
| commit | f094125348fa8512392cc315b16de957c4f35458 (patch) | |
| tree | 3c0c2d436e6c87965fd8a8c703646f40c0e0207d /src | |
| parent | 065c9eb405d6b80fa96630a6f4b9c76dc6ab0486 (diff) | |
| download | emacs-f094125348fa8512392cc315b16de957c4f35458.tar.gz emacs-f094125348fa8512392cc315b16de957c4f35458.zip | |
* fileio.c (time_error_value): Rename from special_mtime.
The old name's problems were noted by Eli Zaretskii in
<http://lists.gnu.org/archive/html/emacs-devel/2012-07/msg00087.html>.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/fileio.c | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 06f9f9370a0..6493d9eab05 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,9 @@ | |||
| 1 | 2012-07-04 Paul Eggert <eggert@cs.ucla.edu> | 1 | 2012-07-04 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 2 | ||
| 3 | * fileio.c (time_error_value): Rename from special_mtime. | ||
| 4 | The old name's problems were noted by Eli Zaretskii in | ||
| 5 | <http://lists.gnu.org/archive/html/emacs-devel/2012-07/msg00087.html>. | ||
| 6 | |||
| 3 | * emacs.c (gdb_pvec_type): Change it back to enum pvec_type. | 7 | * emacs.c (gdb_pvec_type): Change it back to enum pvec_type. |
| 4 | This variable's comment says Emacs needs at least one GDB-visible | 8 | This variable's comment says Emacs needs at least one GDB-visible |
| 5 | symbol of type enum pvec_type, to work around GDB problems. | 9 | symbol of type enum pvec_type, to work around GDB problems. |
diff --git a/src/fileio.c b/src/fileio.c index 1dadd06c283..5905c0e5511 100644 --- a/src/fileio.c +++ b/src/fileio.c | |||
| @@ -3213,9 +3213,9 @@ emacs_lseek (int fd, EMACS_INT offset, int whence) | |||
| 3213 | return lseek (fd, offset, whence); | 3213 | return lseek (fd, offset, whence); |
| 3214 | } | 3214 | } |
| 3215 | 3215 | ||
| 3216 | /* Return a special mtime value indicating the error number ERRNUM. */ | 3216 | /* Return a special time value indicating the error number ERRNUM. */ |
| 3217 | static EMACS_TIME | 3217 | static EMACS_TIME |
| 3218 | special_mtime (int errnum) | 3218 | time_error_value (int errnum) |
| 3219 | { | 3219 | { |
| 3220 | EMACS_TIME t; | 3220 | EMACS_TIME t; |
| 3221 | int ns = (errno == ENOENT || errno == EACCES || errno == ENOTDIR | 3221 | int ns = (errno == ENOENT || errno == EACCES || errno == ENOTDIR |
| @@ -3336,7 +3336,7 @@ variable `last-coding-system-used' to the coding system actually used. */) | |||
| 3336 | save_errno = errno; | 3336 | save_errno = errno; |
| 3337 | if (NILP (visit)) | 3337 | if (NILP (visit)) |
| 3338 | report_file_error ("Opening input file", Fcons (orig_filename, Qnil)); | 3338 | report_file_error ("Opening input file", Fcons (orig_filename, Qnil)); |
| 3339 | mtime = special_mtime (save_errno); | 3339 | mtime = time_error_value (save_errno); |
| 3340 | st.st_size = -1; | 3340 | st.st_size = -1; |
| 3341 | how_much = 0; | 3341 | how_much = 0; |
| 3342 | if (!NILP (Vcoding_system_for_read)) | 3342 | if (!NILP (Vcoding_system_for_read)) |
| @@ -5106,7 +5106,7 @@ See Info node `(elisp)Modification Time' for more details. */) | |||
| 5106 | 5106 | ||
| 5107 | mtime = (stat (SSDATA (filename), &st) == 0 | 5107 | mtime = (stat (SSDATA (filename), &st) == 0 |
| 5108 | ? get_stat_mtime (&st) | 5108 | ? get_stat_mtime (&st) |
| 5109 | : special_mtime (errno)); | 5109 | : time_error_value (errno)); |
| 5110 | if ((EMACS_TIME_EQ (mtime, b->modtime) | 5110 | if ((EMACS_TIME_EQ (mtime, b->modtime) |
| 5111 | /* If both exist, accept them if they are off by one second. */ | 5111 | /* If both exist, accept them if they are off by one second. */ |
| 5112 | || (EMACS_TIME_VALID_P (mtime) && EMACS_TIME_VALID_P (b->modtime) | 5112 | || (EMACS_TIME_VALID_P (mtime) && EMACS_TIME_VALID_P (b->modtime) |