HASHIMOTO Taiichi
taiic****@users*****
2006年 11月 11日 (土) 22:53:08 JST
Index: inline_patch/ChangeLog diff -u inline_patch/ChangeLog:1.26 inline_patch/ChangeLog:1.27 --- inline_patch/ChangeLog:1.26 Wed Jun 28 00:33:16 2006 +++ inline_patch/ChangeLog Sat Nov 11 22:53:07 2006 @@ -1,3 +1,7 @@ +2006-11-11 HASHIMOTO Taiichi <taiic****@mac*****> + + * mac-win.el: •ÏŠ·’†‚ɃJ[ƒ\ƒ‹ˆÊ’u‚Ìoverlay‚𔽉f‚³‚¹‚é + 2006-06-28 HASHIMOTO Taiichi <taiic****@mac*****> * mac-im.el: mac-setup-inline-input-method‚ðíœ Index: inline_patch/emacs-inline.patch diff -u inline_patch/emacs-inline.patch:1.33 inline_patch/emacs-inline.patch:1.34 --- inline_patch/emacs-inline.patch:1.33 Wed Jun 28 00:33:16 2006 +++ inline_patch/emacs-inline.patch Sat Nov 11 22:53:07 2006 @@ -1,6 +1,6 @@ -diff -prN -x '*.orig' ../emacs-20060617-0/lisp/loadup.el lisp/loadup.el -*** ../emacs-20060617-0/lisp/loadup.el Fri Jun 16 23:46:36 2006 ---- lisp/loadup.el Fri Jun 16 23:47:19 2006 +diff -p -N -r ../emacs-20061110-0/lisp/loadup.el lisp/loadup.el +*** ../emacs-20061110-0/lisp/loadup.el 2006-11-10 21:10:59.000000000 +0900 +--- lisp/loadup.el 2006-11-10 21:11:38.000000000 +0900 *************** *** 207,212 **** --- 207,215 ---- @@ -13,9 +13,9 @@ (message "%s" (garbage-collect)) (load "vc-hooks") -diff -prN -x '*.orig' ../emacs-20060617-0/lisp/term/mac-im.el lisp/term/mac-im.el -*** ../emacs-20060617-0/lisp/term/mac-im.el Thu Jan 1 09:00:00 1970 ---- lisp/term/mac-im.el Sat Jun 24 00:34:36 2006 +diff -p -N -r ../emacs-20061110-0/lisp/term/mac-im.el lisp/term/mac-im.el +*** ../emacs-20061110-0/lisp/term/mac-im.el 1970-01-01 09:00:00.000000000 +0900 +--- lisp/term/mac-im.el 2006-11-10 21:11:38.000000000 +0900 *************** *** 0 **** --- 1,208 ---- @@ -227,9 +227,38 @@ + (define-key special-event-map + [mac-change-input-method] 'mac-handle-input-method-change) + -diff -prN -x '*.orig' ../emacs-20060617-0/src/Makefile.in src/Makefile.in -*** ../emacs-20060617-0/src/Makefile.in Fri Jun 16 23:46:42 2006 ---- src/Makefile.in Fri Jun 16 23:47:20 2006 +diff -p -N -r ../emacs-20061110-0/lisp/term/mac-win.el lisp/term/mac-win.el +*** ../emacs-20061110-0/lisp/term/mac-win.el 2006-11-10 21:10:44.000000000 +0900 +--- lisp/term/mac-win.el 2006-11-11 21:19:36.000000000 +0900 +*************** either in the current buffer or in the e +*** 2038,2045 **** + (setq msg active-input-string)) + (message "%s" msg) + (overlay-put mac-ts-active-input-overlay 'before-string nil)) + (move-overlay mac-ts-active-input-overlay +! (point) (point) (current-buffer)) + (overlay-put mac-ts-active-input-overlay 'before-string + active-input-string)) + ;; Unread confirmed characters and insert them in a keyboard +--- 2038,2052 ---- + (setq msg active-input-string)) + (message "%s" msg) + (overlay-put mac-ts-active-input-overlay 'before-string nil)) ++ (let ((overlays (overlays-in (point) (point)))) ++ (while overlays ++ (let ((face (overlay-get (car overlays) 'face))) ++ (if face ++ (overlay-put mac-ts-active-input-overlay 'face face))) ++ (setq overlays (cdr overlays)))) + (move-overlay mac-ts-active-input-overlay +! (point) (+ (point) (length active-input-string)) +! (current-buffer)) + (overlay-put mac-ts-active-input-overlay 'before-string + active-input-string)) + ;; Unread confirmed characters and insert them in a keyboard +diff -p -N -r -x '*.orig' ../emacs-20061110-0/src/Makefile.in src/Makefile.in +*** ../emacs-20061110-0/src/Makefile.in 2006-11-10 21:10:21.000000000 +0900 +--- src/Makefile.in 2006-11-10 21:11:38.000000000 +0900 *************** CYGWIN_OBJ = sheap.o *** 569,575 **** @@ -265,8 +294,8 @@ w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o *************** macterm.o: blockinput.h atimer.h systime -*** 1273,1278 **** ---- 1273,1282 ---- +*** 1274,1279 **** +--- 1274,1283 ---- frame.h charset.h ccl.h dispextern.h fontset.h termhooks.h termopts.h \ termchar.h gnu.h disptab.h buffer.h window.h keyboard.h $(INTERVAL_SRC) \ process.h coding.h $(config_h) @@ -277,12 +306,12 @@ macselect.o: blockinput.h macterm.h macgui.h frame.h keymap.h $(config_h) ${emacsapp}Contents/Resources/English.lproj: -diff -prN -x '*.orig' ../emacs-20060617-0/src/keyboard.c src/keyboard.c -*** ../emacs-20060617-0/src/keyboard.c Fri Jun 16 23:46:42 2006 ---- src/keyboard.c Fri Jun 16 23:47:20 2006 +diff -p -N -r -x '*.orig' ../emacs-20061110-0/src/keyboard.c src/keyboard.c +*** ../emacs-20061110-0/src/keyboard.c 2006-11-10 21:10:21.000000000 +0900 +--- src/keyboard.c 2006-11-10 21:11:38.000000000 +0900 *************** Lisp_Object Qmouse_click; -*** 528,533 **** ---- 528,536 ---- +*** 531,536 **** +--- 531,539 ---- #if defined (WINDOWSNT) || defined (MAC_OS) Lisp_Object Qlanguage_change; #endif @@ -293,8 +322,8 @@ Lisp_Object Qsave_session; #ifdef MAC_OS *************** kbd_buffer_get_event (kbp, used_mouse_me -*** 4056,4061 **** ---- 4059,4073 ---- +*** 4116,4121 **** +--- 4119,4133 ---- kbd_fetch_ptr = event + 1; } #endif @@ -311,8 +340,8 @@ { obj = Fcons (Qsave_session, Qnil); *************** syms_of_keyboard () -*** 10898,10903 **** ---- 10910,10919 ---- +*** 11015,11020 **** +--- 11027,11036 ---- Qlanguage_change = intern ("language-change"); staticpro (&Qlanguage_change); #endif @@ -323,12 +352,12 @@ Qdrag_n_drop = intern ("drag-n-drop"); staticpro (&Qdrag_n_drop); -diff -prN -x '*.orig' ../emacs-20060617-0/src/macim.c src/macim.c -*** ../emacs-20060617-0/src/macim.c Thu Jan 1 09:00:00 1970 ---- src/macim.c Sat Jun 24 00:35:51 2006 +diff -p -N -r -x '*.orig' ../emacs-20061110-0/src/macim.c src/macim.c +*** ../emacs-20061110-0/src/macim.c 1970-01-01 09:00:00.000000000 +0900 +--- src/macim.c 2006-11-11 22:22:16.000000000 +0900 *************** *** 0 **** ---- 1,257 ---- +--- 1,258 ---- + /* Implementation of Inline Input Method for MacOS X. + Copyright (C) 2004, 2005, 2006 Taiichi Hashimoto <taiic****@mac*****>. + @@ -542,7 +571,8 @@ + buf = Fsymbol_value (intern ("mac-ts-active-input-buf")); + + if (GetScriptManagerVariable (smKeyScript) -+ && (this_command_key_count || cursor_in_echo_area)) ++ && (this_command_key_count ++ || cursor_in_echo_area)) + return FALSE; + else if (!Flength (buf)) + { @@ -586,11 +616,11 @@ + + #endif + -diff -prN -x '*.orig' ../emacs-20060617-0/src/macterm.c src/macterm.c -*** ../emacs-20060617-0/src/macterm.c Fri Jun 16 23:46:42 2006 ---- src/macterm.c Wed Jun 28 00:14:36 2006 +diff -p -N -r -x '*.orig' ../emacs-20061110-0/src/macterm.c src/macterm.c +*** ../emacs-20061110-0/src/macterm.c 2006-11-10 21:10:21.000000000 +0900 +--- src/macterm.c 2006-11-10 21:33:27.000000000 +0900 *************** XTread_socket (sd, expected, hold_quit) -*** 10654,10660 **** +*** 10807,10813 **** normally. */ if (!(mapped_modifiers & ~(mac_pass_command_to_system ? cmdKey : 0) @@ -598,7 +628,7 @@ { OSStatus err; ---- 10654,10662 ---- +--- 10807,10815 ---- normally. */ if (!(mapped_modifiers & ~(mac_pass_command_to_system ? cmdKey : 0) @@ -609,8 +639,8 @@ OSStatus err; *************** XTread_socket (sd, expected, hold_quit) -*** 10876,10881 **** ---- 10878,10884 ---- +*** 11029,11034 **** +--- 11031,11037 ---- count++; } @@ -619,8 +649,8 @@ /* If the focus was just given to an autoraising frame, *************** init_tsm () -*** 11306,11311 **** ---- 11309,11316 ---- +*** 11466,11471 **** +--- 11469,11476 ---- NewTSMDocument (sizeof (types) / sizeof (types[0]), types, &tsm_document_id, 0); @@ -629,12 +659,12 @@ } #endif -diff -prN -x '*.orig' ../emacs-20060617-0/src/termhooks.h src/termhooks.h -*** ../emacs-20060617-0/src/termhooks.h Fri Jun 16 23:46:43 2006 ---- src/termhooks.h Fri Jun 16 23:47:20 2006 +diff -p -N -r -x '*.orig' ../emacs-20061110-0/src/termhooks.h src/termhooks.h +*** ../emacs-20061110-0/src/termhooks.h 2006-11-10 21:10:23.000000000 +0900 +--- src/termhooks.h 2006-11-10 21:11:38.000000000 +0900 *************** enum event_kind -*** 260,265 **** ---- 260,269 ---- +*** 265,270 **** +--- 265,274 ---- language is changed by the user. */ #endif
