diff options
| author | Martin Rudalics <rudalics@gmx.at> | 2012-08-14 10:44:24 +0200 |
|---|---|---|
| committer | Martin Rudalics <rudalics@gmx.at> | 2012-08-14 10:44:24 +0200 |
| commit | 08908acaa6d4e2679cf2fc32c91c17906a4de639 (patch) | |
| tree | b2958f917124c082f606daf1b62bc4748550f60b /src/minibuf.c | |
| parent | e5b19827faaff8168889c9cf3c8f746fd67e6991 (diff) | |
| download | emacs-08908acaa6d4e2679cf2fc32c91c17906a4de639.tar.gz | |
Don't call Fset_window_buffer from C code.
* frame.c (make_frame_without_minibuffer, make_minibuffer_frame)
(delete_frame, Fmake_frame_invisible, Ficonify_frame):
* minibuf.c (choose_minibuf_frame, read_minibuf):
* w32fns.c (x_create_tip_frame):
* xfns.c (x_create_tip_frame): Call set_window_buffer instead of
Fset_window_buffer (Bug#11984, Bug#12025, Bug#12026).
Diffstat (limited to 'src/minibuf.c')
| -rw-r--r-- | src/minibuf.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/minibuf.c b/src/minibuf.c index 3a384bf57bb..59da974df00 100644 --- a/src/minibuf.c +++ b/src/minibuf.c @@ -117,7 +117,9 @@ choose_minibuf_frame (void) init_window_once. That window doesn't have a buffer. */ buffer = XWINDOW (minibuf_window)->buffer; if (BUFFERP (buffer)) - Fset_window_buffer (sf->minibuffer_window, buffer, Qnil); + /* Use set_window_buffer instead of Fset_window_buffer (see + discussion of bug#11984, bug#12025, bug#12026). */ + set_window_buffer (sf->minibuffer_window, buffer, 0, 0); minibuf_window = sf->minibuffer_window; } @@ -617,11 +619,15 @@ read_minibuf (Lisp_Object map, Lisp_Object initial, Lisp_Object prompt, if (! NILP (mini_window) && ! EQ (mini_window, minibuf_window) && !NILP (Fwindow_minibuffer_p (mini_window))) - Fset_window_buffer (mini_window, empty_minibuf, Qnil); + /* Use set_window_buffer instead of Fset_window_buffer (see + discussion of bug#11984, bug#12025, bug#12026). */ + set_window_buffer (mini_window, empty_minibuf, 0, 0); } /* Display this minibuffer in the proper window. */ - Fset_window_buffer (minibuf_window, Fcurrent_buffer (), Qnil); + /* Use set_window_buffer instead of Fset_window_buffer (see + discussion of bug#11984, bug#12025, bug#12026). */ + set_window_buffer (minibuf_window, Fcurrent_buffer (), 0, 0); Fselect_window (minibuf_window, Qnil); XWINDOW (minibuf_window)->hscroll = 0; |