From 387d4d92bca5cf7f0eb14c2b917773dde7b06041 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 29 Jul 2012 09:00:35 -0700 Subject: [PATCH] * alloc.c (Fgarbage_collect): Indent as per usual Emacs style. --- src/ChangeLog | 4 ++++ src/alloc.c | 14 ++++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 8f9b7cc8084..fa1877f91c2 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2012-07-29 Paul Eggert + + * alloc.c (Fgarbage_collect): Indent as per usual Emacs style. + 2012-07-29 Eli Zaretskii * makefile.w32-in (LISP_H): Add $(NT_INC)/stdalign.h. diff --git a/src/alloc.c b/src/alloc.c index 625acad991c..7680b3a2d84 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -5706,9 +5706,9 @@ See Info node `(elisp)Garbage Collection'. */) #if GC_MARK_STACK == GC_USE_GCPROS_CHECK_ZOMBIES { /* Compute average percentage of zombies. */ - double nlive = - total_conses + total_symbols + total_markers + total_strings - + total_vectors + total_floats + total_intervals + total_buffers; + double nlive = + (total_conses + total_symbols + total_markers + total_strings + + total_vectors + total_floats + total_intervals + total_buffers); avg_live = (avg_live * ngcs + nlive) / (ngcs + 1); max_live = max (nlive, max_live); @@ -5727,9 +5727,11 @@ See Info node `(elisp)Garbage Collection'. */) /* Accumulate statistics. */ if (FLOATP (Vgc_elapsed)) - Vgc_elapsed = make_float - (XFLOAT_DATA (Vgc_elapsed) + EMACS_TIME_TO_DOUBLE - (sub_emacs_time (current_emacs_time (), start))); + { + EMACS_TIME since_start = sub_emacs_time (current_emacs_time (), start); + Vgc_elapsed = make_float (XFLOAT_DATA (Vgc_elapsed) + + EMACS_TIME_TO_DOUBLE (since_start)); + } gcs_done++; -- 2.39.2