diff options
| author | Martin Rudalics | 2012-08-14 10:44:24 +0200 |
|---|---|---|
| committer | Martin Rudalics | 2012-08-14 10:44:24 +0200 |
| commit | 08908acaa6d4e2679cf2fc32c91c17906a4de639 (patch) | |
| tree | b2958f917124c082f606daf1b62bc4748550f60b /src/xfns.c | |
| parent | e5b19827faaff8168889c9cf3c8f746fd67e6991 (diff) | |
| download | emacs-08908acaa6d4e2679cf2fc32c91c17906a4de639.tar.gz emacs-08908acaa6d4e2679cf2fc32c91c17906a4de639.zip | |
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/xfns.c')
| -rw-r--r-- | src/xfns.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/xfns.c b/src/xfns.c index bbc9f375340..3242af937c9 100644 --- a/src/xfns.c +++ b/src/xfns.c | |||
| @@ -4591,7 +4591,9 @@ x_create_tip_frame (struct x_display_info *dpyinfo, | |||
| 4591 | XSETFRAME (frame, f); | 4591 | XSETFRAME (frame, f); |
| 4592 | 4592 | ||
| 4593 | buffer = Fget_buffer_create (build_string (" *tip*")); | 4593 | buffer = Fget_buffer_create (build_string (" *tip*")); |
| 4594 | Fset_window_buffer (FRAME_ROOT_WINDOW (f), buffer, Qnil); | 4594 | /* Use set_window_buffer instead of Fset_window_buffer (see |
| 4595 | discussion of bug#11984, bug#12025, bug#12026). */ | ||
| 4596 | set_window_buffer (FRAME_ROOT_WINDOW (f), buffer, 0, 0); | ||
| 4595 | old_buffer = current_buffer; | 4597 | old_buffer = current_buffer; |
| 4596 | set_buffer_internal_1 (XBUFFER (buffer)); | 4598 | set_buffer_internal_1 (XBUFFER (buffer)); |
| 4597 | BSET (current_buffer, truncate_lines, Qnil); | 4599 | BSET (current_buffer, truncate_lines, Qnil); |