From eac4d08fb1864aa178cfa0037352f5a0a7a20597 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20Dj=C3=A4rv?= Date: Sun, 13 Jan 2013 13:08:31 +0100 Subject: [PATCH] * nsterm.m (keyDown:): Set processingCompose to NO if an emacs key event is generated. (doCommandBySelector:): Set processingCompose to NO. --- src/ChangeLog | 4 ++++ src/nsterm.m | 2 ++ 2 files changed, 6 insertions(+) diff --git a/src/ChangeLog b/src/ChangeLog index a002eaf33d8..5c6c5180be5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,9 @@ 2013-01-13 Jan Djärv + * nsterm.m (keyDown:): Set processingCompose to NO if an emacs key + event is generated. + (doCommandBySelector:): Set processingCompose to NO. + * nsfont.m (ns_findfonts): Add block/unblock_input calls. Remove check for fkeys count > zero, block/unblock fixes the real bug. (nsfont_list_family): Add block/unblock_input calls. diff --git a/src/nsterm.m b/src/nsterm.m index 0fd062b7f17..48efac3f70b 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -4981,6 +4981,7 @@ not_in_argv (NSString *arg) emacs_event->code = code; EV_TRAILER (theEvent); + processingCompose = NO; return; } } @@ -5171,6 +5172,7 @@ not_in_argv (NSString *arg) if (NS_KEYLOG) NSLog (@"doCommandBySelector: %@", NSStringFromSelector (aSelector)); + processingCompose = NO; if (aSelector == @selector (deleteBackward:)) { /* happens when user backspaces over an ongoing composition: -- 2.39.5