* nsterm.m (keyDown:): Set processingCompose to NO if an emacs key

event is generated.
(doCommandBySelector:): Set processingCompose to NO.

diff --git a/src/ChangeLog b/src/ChangeLog
index a002eaf33d826ebe26de468840c77bd82fb9873c..5c6c5180be54e271344210cdf100a7e70e1a75a3 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2013-01-13  Jan Djärv  <jan.h.d@swipnet.se>
 
+       * 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 0fd062b7f17dfb2673f051a548f736840d23f914..48efac3f70b1c1c5f4ebb32d5a0c0c6c0e7665de 100644 (file)
--- 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: