- old_buffer = WVAR (w, buffer);
- old_charpos = XMARKER (WVAR (w, pointm))->charpos;
- old_bytepos = XMARKER (WVAR (w, pointm))->bytepos;
- XSETBUFFER (WVAR (w, buffer), current_buffer);
- set_marker_both (WVAR (w, pointm), WVAR (w, buffer),
+ old_buffer = w->buffer;
+ old_charpos = XMARKER (w->pointm)->charpos;
+ old_bytepos = XMARKER (w->pointm)->bytepos;
+ wset_buffer (w, Fcurrent_buffer ());
+ set_marker_both (w->pointm, w->buffer,