diff options
| author | Dmitry Antipov | 2013-09-05 07:51:37 +0400 |
|---|---|---|
| committer | Dmitry Antipov | 2013-09-05 07:51:37 +0400 |
| commit | 98b7f4bdefcc684389bebbd855a02a8097f1bb45 (patch) | |
| tree | c7bdd5c9f2acd223fe0029b937d603d96a1bcc79 /src/frame.c | |
| parent | c0458e0b21bf507b6a9273189c58a6b97efa2db2 (diff) | |
| download | emacs-98b7f4bdefcc684389bebbd855a02a8097f1bb45.tar.gz emacs-98b7f4bdefcc684389bebbd855a02a8097f1bb45.zip | |
* frame.c (check_minibuf_window): Update 'frame' with frame pointer.
* xterm.c (x_scroll_bar_handle_click) [!USE_TOOLKIT_SCROLL_BARS]:
Don't pass C integer to XINT (tiny fix for 2013-09-03 change).
Diffstat (limited to 'src/frame.c')
| -rw-r--r-- | src/frame.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/frame.c b/src/frame.c index d11a6b8fee9..b4638ed53c8 100644 --- a/src/frame.c +++ b/src/frame.c | |||
| @@ -1133,6 +1133,8 @@ check_minibuf_window (Lisp_Object frame, int select) | |||
| 1133 | { | 1133 | { |
| 1134 | struct frame *f = decode_live_frame (frame); | 1134 | struct frame *f = decode_live_frame (frame); |
| 1135 | 1135 | ||
| 1136 | XSETFRAME (frame, f); | ||
| 1137 | |||
| 1136 | if (WINDOWP (minibuf_window) && EQ (f->minibuffer_window, minibuf_window)) | 1138 | if (WINDOWP (minibuf_window) && EQ (f->minibuffer_window, minibuf_window)) |
| 1137 | { | 1139 | { |
| 1138 | Lisp_Object frames, this, window = make_number (0); | 1140 | Lisp_Object frames, this, window = make_number (0); |