mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-12-03 08:30:09 +00:00
Avoid side-effects inside XSETFASTINT's arguments.
This commit is contained in:
parent
3c7a4fa359
commit
2a1893f46c
@ -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
|
||||
|
@ -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;
|
||||
|
||||
|
11
src/window.c
11
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;
|
||||
|
Loading…
Reference in New Issue
Block a user