From 2a1893f46c899b7e15c76849c59099050a1b1203 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Tue, 16 Nov 2004 15:35:14 +0000 Subject: [PATCH] Avoid side-effects inside XSETFASTINT's arguments. --- src/fns.c | 2 +- src/frame.c | 3 ++- src/window.c | 11 +++++++---- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/fns.c b/src/fns.c index 2d9131846a9..d9f697a689b 100644 --- a/src/fns.c +++ b/src/fns.c @@ -741,7 +741,7 @@ concat (nargs, args, target_type, last_special) } else { - XSETFASTINT (elt, SREF (this, thisindex++)); + XSETFASTINT (elt, SREF (this, thisindex)); thisindex++; if (some_multibyte && (XINT (elt) >= 0240 || (XINT (elt) >= 0200 diff --git a/src/frame.c b/src/frame.c index 19f23ad8cd8..9a176a67741 100644 --- a/src/frame.c +++ b/src/frame.c @@ -371,7 +371,8 @@ make_frame (mini_p) f->selected_window = root_window; /* Make sure this window seems more recently used than a newly-created, never-selected window. */ - XSETFASTINT (XWINDOW (f->selected_window)->use_time, ++window_select_count); + ++window_select_count; + XSETFASTINT (XWINDOW (f->selected_window)->use_time, window_select_count); f->default_face_done_p = 0; diff --git a/src/window.c b/src/window.c index 7c2fbc60612..7362aa51178 100644 --- a/src/window.c +++ b/src/window.c @@ -241,7 +241,8 @@ make_window () register struct window *p; p = allocate_window (); - XSETFASTINT (p->sequence_number, ++sequence_number); + ++sequence_number; + XSETFASTINT (p->sequence_number, sequence_number); XSETFASTINT (p->left_col, 0); XSETFASTINT (p->top_line, 0); XSETFASTINT (p->total_lines, 0); @@ -3149,7 +3150,8 @@ selects the buffer of the selected window before each command. */) w = XWINDOW (window); w->frozen_window_start_p = 0; - XSETFASTINT (w->use_time, ++window_select_count); + ++window_select_count; + XSETFASTINT (w->use_time, window_select_count); if (EQ (window, selected_window)) return window; @@ -3640,7 +3642,8 @@ make_dummy_parent (window) = ((struct Lisp_Vector *)o)->contents[i]; XSETWINDOW (new, p); - XSETFASTINT (p->sequence_number, ++sequence_number); + ++sequence_number; + XSETFASTINT (p->sequence_number, sequence_number); /* Put new into window structure in place of window */ replace_window (window, new); @@ -5882,7 +5885,7 @@ save_window_save (window, vector, i) p = SAVED_WINDOW_N (vector, i); w = XWINDOW (window); - XSETFASTINT (w->temslot, i++); + XSETFASTINT (w->temslot, i); i++; p->window = window; p->buffer = w->buffer; p->left_col = w->left_col; -- 2.39.2