Mercurial > emacs
comparison src/editfns.c @ 90951:3619e7770f2e
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 793-802)
- Update from CVS
- Remove RCS keywords
- Merge from emacs--rel--22
* emacs--rel--22 (patch 42-50)
- Update from CVS
- Merge from gnus--rel--5.10
- Gnus ChangeLog tweaks
* gnus--rel--5.10 (patch 229-232)
- Merge from emacs--devo--0, emacs--rel--22
- ChangeLog tweak
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-223
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sat, 16 Jun 2007 22:32:13 +0000 |
parents | e9f94688a064 9086f0548bdc |
children | a66921565bcb |
comparison
equal
deleted
inserted
replaced
90950:8568c29985a3 | 90951:3619e7770f2e |
---|---|
82 (1000 - TM_YEAR_BASE <= (tm_year) && (tm_year) <= 9999 - TM_YEAR_BASE) | 82 (1000 - TM_YEAR_BASE <= (tm_year) && (tm_year) <= 9999 - TM_YEAR_BASE) |
83 #endif | 83 #endif |
84 | 84 |
85 extern size_t emacs_strftimeu P_ ((char *, size_t, const char *, | 85 extern size_t emacs_strftimeu P_ ((char *, size_t, const char *, |
86 const struct tm *, int)); | 86 const struct tm *, int)); |
87 | |
88 #ifdef WINDOWSNT | |
89 extern Lisp_Object w32_get_internal_run_time (); | |
90 #endif | |
91 | |
87 static int tm_diff P_ ((struct tm *, struct tm *)); | 92 static int tm_diff P_ ((struct tm *, struct tm *)); |
88 static void find_field P_ ((Lisp_Object, Lisp_Object, Lisp_Object, int *, Lisp_Object, int *)); | 93 static void find_field P_ ((Lisp_Object, Lisp_Object, Lisp_Object, int *, Lisp_Object, int *)); |
89 static void update_buffer_properties P_ ((int, int)); | 94 static void update_buffer_properties P_ ((int, int)); |
90 static Lisp_Object region_limit P_ ((int)); | 95 static Lisp_Object region_limit P_ ((int)); |
91 int lisp_time_argument P_ ((Lisp_Object, time_t *, int *)); | 96 int lisp_time_argument P_ ((Lisp_Object, time_t *, int *)); |
1479 } | 1484 } |
1480 | 1485 |
1481 return list3 (make_number ((secs >> 16) & 0xffff), | 1486 return list3 (make_number ((secs >> 16) & 0xffff), |
1482 make_number ((secs >> 0) & 0xffff), | 1487 make_number ((secs >> 0) & 0xffff), |
1483 make_number (usecs)); | 1488 make_number (usecs)); |
1484 #else | 1489 #else /* ! HAVE_GETRUSAGE */ |
1490 #if WINDOWSNT | |
1491 return w32_get_internal_run_time (); | |
1492 #else /* ! WINDOWSNT */ | |
1485 return Fcurrent_time (); | 1493 return Fcurrent_time (); |
1486 #endif | 1494 #endif /* WINDOWSNT */ |
1495 #endif /* HAVE_GETRUSAGE */ | |
1487 } | 1496 } |
1488 | 1497 |
1489 | 1498 |
1490 int | 1499 int |
1491 lisp_time_argument (specified_time, result, usec) | 1500 lisp_time_argument (specified_time, result, usec) |