[Emacs-diffs] /srv/bzr/emacs/trunk r111505: * nsterm.m (keyDown:): Set processingCompose to NO if an emacs key

[Jan D.]

------------------------------------------------------------
revno: 111505
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Sun 2013-01-13 13:08:31 +0100
message:
  * nsterm.m (keyDown:): Set processingCompose to NO if an emacs key
  event is generated.
  (doCommandBySelector:): Set processingCompose to NO.
modified:
  src/ChangeLog
  src/nsterm.m

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-01-13 12:05:17 +0000
+++ b/src/ChangeLog     2013-01-13 12:08:31 +0000
@@ -1,5 +1,9 @@
 2013-01-13  Jan Djärv  <address@hidden>
 
+       * 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.

=== modified file 'src/nsterm.m'
--- a/src/nsterm.m      2013-01-04 19:22:37 +0000
+++ b/src/nsterm.m      2013-01-13 12:08:31 +0000
@@ -4981,6 +4981,7 @@
 
           emacs_event->code = code;
           EV_TRAILER (theEvent);
+          processingCompose = NO;
           return;
         }
     }
@@ -5171,6 +5172,7 @@
   if (NS_KEYLOG)
     NSLog (@"doCommandBySelector: %@", NSStringFromSelector (aSelector));
 
+  processingCompose = NO;
   if (aSelector == @selector (deleteBackward:))
     {
       /* happens when user backspaces over an ongoing composition: