diff options
| author | Dmitry Antipov <dmantipov@yandex.ru> | 2012-08-06 14:24:26 +0400 |
|---|---|---|
| committer | Dmitry Antipov <dmantipov@yandex.ru> | 2012-08-06 14:24:26 +0400 |
| commit | 077288cf3f654776ee44bc9b56954c4e26b10d96 (patch) | |
| tree | 00bbcb4dab9c879efde73a01786977b1c1364f67 /src/minibuf.c | |
| parent | 71688bd7f9169c12ea8be54e084470f19d44ce44 (diff) | |
| download | emacs-077288cf3f654776ee44bc9b56954c4e26b10d96.tar.gz | |
Separate read and write access to Lisp_Object slots of struct window.
* window.h (WGET, WSET): New macros similar to AREF and ASET.
* alloc.c, buffer.c, composite.c, dispextern.h, dispnew.c, editfns.c:
* fileio.c, font.c, fontset.c, frame.c, frame.h, fringe.c, indent.c:
* insdel.c, keyboard.c, keymap.c, lisp.h, minibuf.c, msdos.c, nsfns.m:
* nsmenu.m, nsterm.m, print.c, textprop.c, w32fns.c, w32menu.c:
* w32term.c, window.c, xdisp.c, xfaces.c, xfns.c, xmenu.c, xterm.c:
Adjust users.
Diffstat (limited to 'src/minibuf.c')
| -rw-r--r-- | src/minibuf.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/minibuf.c b/src/minibuf.c index a5f963de4be..4ef433b3c86 100644 --- a/src/minibuf.c +++ b/src/minibuf.c @@ -115,7 +115,7 @@ choose_minibuf_frame (void) /* Under X, we come here with minibuf_window being the minibuffer window of the unused termcap window created in init_window_once. That window doesn't have a buffer. */ - buffer = WVAR (XWINDOW (minibuf_window), buffer); + buffer = WGET (XWINDOW (minibuf_window), buffer); if (BUFFERP (buffer)) Fset_window_buffer (FGET (sf, minibuffer_window), buffer, Qnil); minibuf_window = FGET (sf, minibuffer_window); @@ -612,7 +612,7 @@ read_minibuf (Lisp_Object map, Lisp_Object initial, Lisp_Object prompt, FOR_EACH_FRAME (dummy, frame) { Lisp_Object root_window = Fframe_root_window (frame); - Lisp_Object mini_window = WVAR (XWINDOW (root_window), next); + Lisp_Object mini_window = WGET (XWINDOW (root_window), next); if (! NILP (mini_window) && ! EQ (mini_window, minibuf_window) && !NILP (Fwindow_minibuffer_p (mini_window))) @@ -687,7 +687,7 @@ read_minibuf (Lisp_Object map, Lisp_Object initial, Lisp_Object prompt, XWINDOW (minibuf_window)->must_be_updated_p = 1; update_frame (XFRAME (selected_frame), 1, 1); { - struct frame *f = XFRAME (WVAR (XWINDOW (minibuf_window), frame)); + struct frame *f = XFRAME (WGET (XWINDOW (minibuf_window), frame)); struct redisplay_interface *rif = FRAME_RIF (f); if (rif && rif->flush_display) rif->flush_display (f); @@ -844,7 +844,7 @@ read_minibuf_unwind (Lisp_Object data) window = minibuf_window; /* To keep things predictable, in case it matters, let's be in the minibuffer when we reset the relevant variables. */ - Fset_buffer (WVAR (XWINDOW (window), buffer)); + Fset_buffer (WGET (XWINDOW (window), buffer)); /* Restore prompt, etc, from outer minibuffer level. */ minibuf_prompt = Fcar (minibuf_save_list); |