procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* frame.c (check_minibuf_window): Update 'frame' with frame pointer.

Browse source 
* 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).
This commit is contained in:
Dmitry Antipov 2013-09-05 07:51:37 +04:00
parent c0458e0b21
commit 98b7f4bdef
3 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ChangeLog
View file

@ -1,3 +1,9 @@
2013-09-05 Dmitry Antipov <dmantipov@yandex.ru>
* 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).
2013-09-05 Stefan Monnier <monnier@iro.umontreal.ca>
* cmds.c (Fself_insert_command): Don't pass a non-integer to XINT.

2
src/frame.c
View file

@ -1133,6 +1133,8 @@ check_minibuf_window (Lisp_Object frame, int select)
{
struct frame *f = decode_live_frame (frame);
XSETFRAME (frame, f);
if (WINDOWP (minibuf_window) && EQ (f->minibuffer_window, minibuf_window))
{
Lisp_Object frames, this, window = make_number (0);

2
src/xterm.c
View file

@ -5473,7 +5473,7 @@ x_scroll_bar_handle_click (struct scroll_bar *bar, XEvent *event, struct input_e
/* If the user has released the handle, set it to its final position. */
if (event->type == ButtonRelease && bar->dragging != -1)
{
int new_start = y - XINT (bar->dragging);
int new_start = y - bar->dragging;
int new_end = new_start + bar->end - bar->start;
x_scroll_bar_set_handle (bar, new_start, new_end, 0);