HASHIMOTO Taiichi
taiic****@users*****
2006年 11月 13日 (月) 21:41:09 JST
Index: inline_patch/ChangeLog diff -u inline_patch/ChangeLog:1.27 inline_patch/ChangeLog:1.28 --- inline_patch/ChangeLog:1.27 Sat Nov 11 22:53:07 2006 +++ inline_patch/ChangeLog Mon Nov 13 21:41:09 2006 @@ -1,3 +1,9 @@ +2006-11-13 HASHIMOTO Taiichi <taiic****@mac*****> + + * macim.c: current buffer ‚ª read only ‚Ì‚Æ‚«‚É“ü—Í‚Ísystem‚É“n‚³ + ‚È‚¢‚悤‚É•ÏXD‚½‚¾‚µCspace ‚¾‚¯‚Í—áŠOD(Command + + space, ‚©‚È, ‰p”‚ð“n‚·‚½‚ß) + 2006-11-11 HASHIMOTO Taiichi <taiic****@mac*****> * mac-win.el: •ÏŠ·’†‚ɃJ[ƒ\ƒ‹ˆÊ’u‚Ìoverlay‚𔽉f‚³‚¹‚é Index: inline_patch/emacs-inline.patch diff -u inline_patch/emacs-inline.patch:1.34 inline_patch/emacs-inline.patch:1.35 --- inline_patch/emacs-inline.patch:1.34 Sat Nov 11 22:53:07 2006 +++ inline_patch/emacs-inline.patch Mon Nov 13 21:41:09 2006 @@ -1,6 +1,6 @@ -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 +diff -p -N -r -x '*.orig' ../emacs-20061111-0/lisp/loadup.el lisp/loadup.el +*** ../emacs-20061111-0/lisp/loadup.el 2006-11-11 22:26:23.000000000 +0900 +--- lisp/loadup.el 2006-11-11 22:27:03.000000000 +0900 *************** *** 207,212 **** --- 207,215 ---- @@ -13,9 +13,9 @@ (message "%s" (garbage-collect)) (load "vc-hooks") -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 +diff -p -N -r -x '*.orig' ../emacs-20061111-0/lisp/term/mac-im.el lisp/term/mac-im.el +*** ../emacs-20061111-0/lisp/term/mac-im.el 1970-01-01 09:00:00.000000000 +0900 +--- lisp/term/mac-im.el 2006-11-11 22:27:03.000000000 +0900 *************** *** 0 **** --- 1,208 ---- @@ -227,9 +227,9 @@ + (define-key special-event-map + [mac-change-input-method] 'mac-handle-input-method-change) + -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 +diff -p -N -r -x '*.orig' ../emacs-20061111-0/lisp/term/mac-win.el lisp/term/mac-win.el +*** ../emacs-20061111-0/lisp/term/mac-win.el 2006-11-11 22:26:14.000000000 +0900 +--- lisp/term/mac-win.el 2006-11-11 22:27:03.000000000 +0900 *************** either in the current buffer or in the e *** 2038,2045 **** (setq msg active-input-string)) @@ -256,9 +256,9 @@ (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 +diff -p -N -r -x '*.orig' ../emacs-20061111-0/src/Makefile.in src/Makefile.in +*** ../emacs-20061111-0/src/Makefile.in 2006-11-11 22:25:57.000000000 +0900 +--- src/Makefile.in 2006-11-11 22:27:03.000000000 +0900 *************** CYGWIN_OBJ = sheap.o *** 569,575 **** @@ -306,9 +306,9 @@ macselect.o: blockinput.h macterm.h macgui.h frame.h keymap.h $(config_h) ${emacsapp}Contents/Resources/English.lproj: -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 +diff -p -N -r -x '*.orig' ../emacs-20061111-0/src/keyboard.c src/keyboard.c +*** ../emacs-20061111-0/src/keyboard.c 2006-11-11 22:25:57.000000000 +0900 +--- src/keyboard.c 2006-11-11 22:27:03.000000000 +0900 *************** Lisp_Object Qmouse_click; *** 531,536 **** --- 531,539 ---- @@ -352,12 +352,12 @@ Qdrag_n_drop = intern ("drag-n-drop"); staticpro (&Qdrag_n_drop); -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 +diff -p -N -r -x '*.orig' ../emacs-20061111-0/src/macim.c src/macim.c +*** ../emacs-20061111-0/src/macim.c 1970-01-01 09:00:00.000000000 +0900 +--- src/macim.c 2006-11-12 21:35:58.000000000 +0900 *************** *** 0 **** ---- 1,258 ---- +--- 1,259 ---- + /* Implementation of Inline Input Method for MacOS X. + Copyright (C) 2004, 2005, 2006 Taiichi Hashimoto <taiic****@mac*****>. + @@ -572,7 +572,8 @@ + + if (GetScriptManagerVariable (smKeyScript) + && (this_command_key_count -+ || cursor_in_echo_area)) ++ || cursor_in_echo_area ++ || (!NILP (current_buffer->read_only) && code != 0x20))) + return FALSE; + else if (!Flength (buf)) + { @@ -616,9 +617,9 @@ + + #endif + -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 +diff -p -N -r -x '*.orig' ../emacs-20061111-0/src/macterm.c src/macterm.c +*** ../emacs-20061111-0/src/macterm.c 2006-11-11 22:25:57.000000000 +0900 +--- src/macterm.c 2006-11-11 22:27:03.000000000 +0900 *************** XTread_socket (sd, expected, hold_quit) *** 10807,10813 **** normally. */ @@ -659,9 +660,9 @@ } #endif -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 +diff -p -N -r -x '*.orig' ../emacs-20061111-0/src/termhooks.h src/termhooks.h +*** ../emacs-20061111-0/src/termhooks.h 2006-11-11 22:25:58.000000000 +0900 +--- src/termhooks.h 2006-11-11 22:27:03.000000000 +0900 *************** enum event_kind *** 265,270 **** --- 265,274 ----
