diff options
| author | Eli Zaretskii | 2012-08-14 21:25:47 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2012-08-14 21:25:47 +0300 |
| commit | 9b8d51650b04c184e53c1c5dc703bb11eed7317e (patch) | |
| tree | a6fa27dc200c5101157a180cfac5f253e9cbc3fe /src | |
| parent | c548f821804e834e29f267e69206ecfd50b48a93 (diff) | |
| download | emacs-9b8d51650b04c184e53c1c5dc703bb11eed7317e.tar.gz emacs-9b8d51650b04c184e53c1c5dc703bb11eed7317e.zip | |
Fix a problem with disabled mouse movement events.
src/keyboard.c (command_loop_1): Reset ignore_mouse_drag_p flag each
iteration through the command loop. Fixes a problem whereby mouse
movements are ignored until the first mouse click.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/keyboard.c | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index ed711b3a663..d1a4006c1bf 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2012-08-14 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * keyboard.c (command_loop_1): Reset ignore_mouse_drag_p flag each | ||
| 4 | iteration through the command loop. Fixes a problem whereby mouse | ||
| 5 | movements are ignored until the first mouse click. | ||
| 6 | |||
| 1 | 2012-08-14 Paul Eggert <eggert@cs.ucla.edu> | 7 | 2012-08-14 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 8 | ||
| 3 | Use bool, not int, for Lisp booleans. | 9 | Use bool, not int, for Lisp booleans. |
diff --git a/src/keyboard.c b/src/keyboard.c index a286e9f3036..73fedc1b35f 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -1393,6 +1393,12 @@ command_loop_1 (void) | |||
| 1393 | 1393 | ||
| 1394 | Vdeactivate_mark = Qnil; | 1394 | Vdeactivate_mark = Qnil; |
| 1395 | 1395 | ||
| 1396 | /* Don't ignore mouse movements for more than a single command | ||
| 1397 | loop. (This flag is set in xdisp.c whenever the tool bar is | ||
| 1398 | resized, because the resize moves text up or down, and would | ||
| 1399 | generate false mouse drag events if we don't ignore them.) */ | ||
| 1400 | ignore_mouse_drag_p = 0; | ||
| 1401 | |||
| 1396 | /* If minibuffer on and echo area in use, | 1402 | /* If minibuffer on and echo area in use, |
| 1397 | wait a short time and redraw minibuffer. */ | 1403 | wait a short time and redraw minibuffer. */ |
| 1398 | 1404 | ||