diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/fileio.c | 8 | ||||
| -rw-r--r-- | src/xselect.c | 6 |
3 files changed, 10 insertions, 8 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index f26f918c941..87376db4e7f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2007-08-03 Richard Stallman <rms@gnu.org> + + * fileio.c (Fvisited_file_modtime): Use make_time. + 2007-08-01 Ryo Yoshitake <ryo@shiftmode.net> (tiny change) * mac.c (init_mac_osx_environment): Adjust load-path on self-contained diff --git a/src/fileio.c b/src/fileio.c index 678c6df58c0..6e47670f09c 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -5694,11 +5694,9 @@ file modification time, this function returns 0. See Info node `(elisp)Modification Time' for more details. */) () { - Lisp_Object tcons; - tcons = long_to_cons ((unsigned long) current_buffer->modtime); - if (CONSP (tcons)) - return list2 (XCAR (tcons), XCDR (tcons)); - return tcons; + if (! current_buffer->modtime) + return make_number (0); + return make_time ((time_t) current_buffer->modtime); } DEFUN ("set-visited-file-modtime", Fset_visited_file_modtime, diff --git a/src/xselect.c b/src/xselect.c index 7e77df0d6c3..b2d47bd1175 100644 --- a/src/xselect.c +++ b/src/xselect.c @@ -1873,9 +1873,9 @@ selection_data_to_lisp_data (display, data, size, type, format) } } - /* Convert a single 16 or small 32 bit number to a Lisp_Int. - If the number is > 16 bits, convert it to a cons of integers, - 16 bits in each half. + /* Convert a single 16-bit number or a small 32-bit number to a Lisp_Int. + If the number is 32 bits and won't fit in a Lisp_Int, + convert it to a cons of integers, 16 bits in each half. */ else if (format == 32 && size == sizeof (int)) return long_to_cons (((unsigned int *) data) [0]); |