Seiji Zenitani
zenit****@users*****
2005年 11月 12日 (土) 21:21:42 JST
Index: CarbonEmacsPackage/GPL/patch/inline_patch-addition.patch diff -u /dev/null CarbonEmacsPackage/GPL/patch/inline_patch-addition.patch:1.1 --- /dev/null Sat Nov 12 21:21:42 2005 +++ CarbonEmacsPackage/GPL/patch/inline_patch-addition.patch Sat Nov 12 21:21:42 2005 @@ -0,0 +1,67 @@ +*** src/keyboard.c.~1.839.~ Tue Oct 4 13:23:12 2005 +--- src/keyboard.c Thu Nov 10 23:12:23 2005 +*************** +*** 114,119 **** +--- 114,124 ---- + + #define abs(x) ((x) >= 0 ? (x) : -(x)) + ++ /* Following variables defined in macim.c */ ++ #ifdef MAC_OSX ++ extern int mac_im_update_text; ++ #endif ++ + /* Following definition copied from eval.c */ + + struct backtrace +*************** +*** 3893,3903 **** +--- 3898,3919 ---- + return obj; + } + ++ #ifdef MAC_OSX ++ /* Turn off this flag for detect inlne input event */ ++ mac_im_update_text = FALSE; ++ #endif ++ + /* Wait until there is input available. */ + for (;;) + { + if (kbd_fetch_ptr != kbd_store_ptr) + break; ++ ++ #ifdef MAC_OSX ++ if (TRUE == mac_im_update_text) ++ break; ++ #endif ++ + #ifdef HAVE_MOUSE + if (!NILP (do_mouse_tracking) && some_mouse_moved ()) + break; + +*** src/macim.c.orig Wed Nov 2 22:18:07 2005 +--- src/macim.c Thu Nov 10 23:24:05 2005 +*************** +*** 111,116 **** +--- 111,119 ---- + + #ifdef MAC_OSX + ++ /* Variables for detect text input on keyboad.c */ ++ int mac_im_update_text = FALSE; ++ + static EventTypeSpec events[] = { + { kEventClassTextInput, kEventTextInputOffsetToPos }, + { kEventClassTextInput, kEventTextInputUpdateActiveInputArea }, +*************** +*** 324,329 **** +--- 327,333 ---- + argv[argc++] = make_string("", 0); + argv[argc++] = make_number(0); + } ++ mac_im_update_text = TRUE; + } + break; + case kEventTextInputGetSelectedText: +