diff options
| author | Jan D | 2015-01-24 10:57:21 +0100 |
|---|---|---|
| committer | Jan D | 2015-01-24 10:57:21 +0100 |
| commit | b4f40757efcb67ed73ca60c257e27dab493ee332 (patch) | |
| tree | 27738adff9e78117d5c3770a3b3b39c65dfc491f /src | |
| parent | 83b3c312d79d119997e3d61f7adb796a371c2f2e (diff) | |
| download | emacs-b4f40757efcb67ed73ca60c257e27dab493ee332.tar.gz emacs-b4f40757efcb67ed73ca60c257e27dab493ee332.zip | |
Fixes: debbugs:19660
* nsterm.m (drawRect:): Add block/unblock_input.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/nsterm.m | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 43e56416e57..9cf5eb591bb 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2015-01-24 Jan Djärv <jan.h.d@swipnet.se> | ||
| 2 | |||
| 3 | * nsterm.m (drawRect:): Add block/unblock_input (Bug#19660). | ||
| 4 | |||
| 1 | 2015-01-21 Paul Eggert <eggert@cs.ucla.edu> | 5 | 2015-01-21 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 6 | ||
| 3 | Fix coding.c subscript error | 7 | Fix coding.c subscript error |
diff --git a/src/nsterm.m b/src/nsterm.m index 24770f6dd10..08b8e3a9076 100644 --- a/src/nsterm.m +++ b/src/nsterm.m | |||
| @@ -6750,7 +6750,9 @@ if (cols > 0 && rows > 0) | |||
| 6750 | return; | 6750 | return; |
| 6751 | 6751 | ||
| 6752 | ns_clear_frame_area (emacsframe, x, y, width, height); | 6752 | ns_clear_frame_area (emacsframe, x, y, width, height); |
| 6753 | block_input (); | ||
| 6753 | expose_frame (emacsframe, x, y, width, height); | 6754 | expose_frame (emacsframe, x, y, width, height); |
| 6755 | unblock_input (); | ||
| 6754 | 6756 | ||
| 6755 | /* | 6757 | /* |
| 6756 | drawRect: may be called (at least in OS X 10.5) for invisible | 6758 | drawRect: may be called (at least in OS X 10.5) for invisible |