diff options
| author | Dmitry Antipov <dmantipov@yandex.ru> | 2012-08-07 09:29:25 +0400 |
|---|---|---|
| committer | Dmitry Antipov <dmantipov@yandex.ru> | 2012-08-07 09:29:25 +0400 |
| commit | e69b09607980b55ee15d60424072feac4b6e72a6 (patch) | |
| tree | a589f89bbd6c3f413383bd3b39b2ed505c773b0c /src/minibuf.c | |
| parent | 5fb50dd30236d8e64951c2f7e72a2d2e15257f24 (diff) | |
| download | emacs-e69b09607980b55ee15d60424072feac4b6e72a6.tar.gz | |
Drop FGET and revert read access to Lisp_Objects slots of struct frame.
* frame.h (FGET): Remove.
(struct frame): Do not use INTERNAL_FIELD.
* buffer.c, data.c, dispnew.c, dosfns.c, eval.c, fontset.c, frame.c:
* fringe.c, gtkutil.c, minibuf.c, msdos.c, nsfns.m, nsmenu.m, nsterm.m:
* print.c, term.c, w32fns.c, w32menu.c, w32term.c, window.c, window.h:
* 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 4ef433b3c86..ec8148e9024 100644 --- a/src/minibuf.c +++ b/src/minibuf.c @@ -102,14 +102,14 @@ choose_minibuf_frame (void) { if (FRAMEP (selected_frame) && FRAME_LIVE_P (XFRAME (selected_frame)) - && !EQ (minibuf_window, FGET (XFRAME (selected_frame), minibuffer_window))) + && !EQ (minibuf_window, XFRAME (selected_frame)->minibuffer_window)) { struct frame *sf = XFRAME (selected_frame); Lisp_Object buffer; /* I don't think that any frames may validly have a null minibuffer window anymore. */ - if (NILP (FGET (sf, minibuffer_window))) + if (NILP (sf->minibuffer_window)) abort (); /* Under X, we come here with minibuf_window being the @@ -117,8 +117,8 @@ choose_minibuf_frame (void) init_window_once. That window doesn't have a 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); + Fset_window_buffer (sf->minibuffer_window, buffer, Qnil); + minibuf_window = sf->minibuffer_window; } /* Make sure no other frame has a minibuffer as its selected window, |