diff options
| author | Miles Bader <miles@gnu.org> | 2006-08-28 04:33:45 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2006-08-28 04:33:45 +0000 |
| commit | 31fcdd90097ed51680348873769d1911a0ec091a (patch) | |
| tree | 3ff8540eba5150cb6ea576a57a53f58cfb01a161 /src/editfns.c | |
| parent | caf94ee75b94ae6958f8cf3bb37b2e96e186ed88 (diff) | |
| parent | a3f3b08bc8f681add7f4f2bdb4699c37a850cbf0 (diff) | |
| download | emacs-31fcdd90097ed51680348873769d1911a0ec091a.tar.gz | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 399-413)
- Update from CVS
- Rcirc update from Ryan Yeske
- Merge from gnus--rel--5.10
- Miscellaneous tq-related fixes.
* gnus--rel--5.10 (patch 126-127)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-105
Diffstat (limited to 'src/editfns.c')
| -rw-r--r-- | src/editfns.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/src/editfns.c b/src/editfns.c index aa6ad457676..362d8fe1dae 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -1433,14 +1433,11 @@ resolution finer than a second. */) () { EMACS_TIME t; - Lisp_Object result[3]; EMACS_GET_TIME (t); - XSETINT (result[0], (EMACS_SECS (t) >> 16) & 0xffff); - XSETINT (result[1], (EMACS_SECS (t) >> 0) & 0xffff); - XSETINT (result[2], EMACS_USECS (t)); - - return Flist (3, result); + return list3 (make_number ((EMACS_SECS (t) >> 16) & 0xffff), + make_number ((EMACS_SECS (t) >> 0) & 0xffff), + make_number (EMACS_USECS (t))); } DEFUN ("get-internal-run-time", Fget_internal_run_time, Sget_internal_run_time, @@ -1458,7 +1455,6 @@ systems that do not provide resolution finer than a second. */) { #ifdef HAVE_GETRUSAGE struct rusage usage; - Lisp_Object result[3]; int secs, usecs; if (getrusage (RUSAGE_SELF, &usage) < 0) @@ -1474,11 +1470,9 @@ systems that do not provide resolution finer than a second. */) secs++; } - XSETINT (result[0], (secs >> 16) & 0xffff); - XSETINT (result[1], (secs >> 0) & 0xffff); - XSETINT (result[2], usecs); - - return Flist (3, result); + return list3 (make_number ((secs >> 16) & 0xffff), + make_number ((secs >> 0) & 0xffff), + make_number (usecs)); #else return Fcurrent_time (); #endif |