HASHIMOTO Taiichi
taiic****@users*****
2006年 11月 16日 (木) 11:26:38 JST
Index: inline_patch/ChangeLog diff -u inline_patch/ChangeLog:1.28 inline_patch/ChangeLog:1.29 --- inline_patch/ChangeLog:1.28 Mon Nov 13 21:41:09 2006 +++ inline_patch/ChangeLog Thu Nov 16 11:26:37 2006 @@ -1,3 +1,7 @@ +2006-11-16 HASHIMOTO Taiichi <taiic****@mac*****> + + * mac-win.el: •ÏŠ·Žž‚Ìface‚ð‰Šú‰»‚·‚éƒR[ƒh‚ð’ljÁ + 2006-11-13 HASHIMOTO Taiichi <taiic****@mac*****> * macim.c: current buffer ‚ª read only ‚Ì‚Æ‚«‚É“ü—Í‚Ísystem‚É“n‚³ Index: inline_patch/emacs-inline.patch diff -u inline_patch/emacs-inline.patch:1.35 inline_patch/emacs-inline.patch:1.36 --- inline_patch/emacs-inline.patch:1.35 Mon Nov 13 21:41:09 2006 +++ inline_patch/emacs-inline.patch Thu Nov 16 11:26:37 2006 @@ -1,6 +1,6 @@ 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 +--- lisp/loadup.el 2006-11-15 09:27:41.000000000 +0900 *************** *** 207,212 **** --- 207,215 ---- @@ -15,7 +15,7 @@ (load "vc-hooks") 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 +--- lisp/term/mac-im.el 2006-11-15 09:27:41.000000000 +0900 *************** *** 0 **** --- 1,208 ---- @@ -229,9 +229,10 @@ + 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 +--- lisp/term/mac-win.el 2006-11-16 10:41:43.000000000 +0900 *************** either in the current buffer or in the e -*** 2038,2045 **** +*** 2037,2045 **** + (concat msg active-input-string))) (setq msg active-input-string)) (message "%s" msg) (overlay-put mac-ts-active-input-overlay 'before-string nil)) @@ -240,15 +241,19 @@ (overlay-put mac-ts-active-input-overlay 'before-string active-input-string)) ;; Unread confirmed characters and insert them in a keyboard ---- 2038,2052 ---- +--- 2037,2055 ---- + (concat msg active-input-string))) (setq msg active-input-string)) (message "%s" msg) ++ (overlay-put mac-ts-active-input-overlay 'face nil) (overlay-put mac-ts-active-input-overlay 'before-string nil)) -+ (let ((overlays (overlays-in (point) (point)))) ++ (overlay-put mac-ts-active-input-overlay 'face nil) ++ (let ((overlays (overlays-in (point) (point))) ++ (face nil)) + (while overlays -+ (let ((face (overlay-get (car overlays) 'face))) -+ (if face -+ (overlay-put mac-ts-active-input-overlay 'face face))) ++ (setq face (overlay-get (car overlays) 'face)) ++ (and 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)) @@ -258,7 +263,7 @@ ;; Unread confirmed characters and insert them in a keyboard 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 +--- src/Makefile.in 2006-11-15 09:27:41.000000000 +0900 *************** CYGWIN_OBJ = sheap.o *** 569,575 **** @@ -308,7 +313,7 @@ ${emacsapp}Contents/Resources/English.lproj: 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 +--- src/keyboard.c 2006-11-15 09:27:41.000000000 +0900 *************** Lisp_Object Qmouse_click; *** 531,536 **** --- 531,539 ---- @@ -354,7 +359,7 @@ 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 +--- src/macim.c 2006-11-15 09:27:41.000000000 +0900 *************** *** 0 **** --- 1,259 ---- @@ -619,7 +624,7 @@ + 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 +--- src/macterm.c 2006-11-15 09:27:41.000000000 +0900 *************** XTread_socket (sd, expected, hold_quit) *** 10807,10813 **** normally. */ @@ -662,7 +667,7 @@ 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 +--- src/termhooks.h 2006-11-15 09:27:41.000000000 +0900 *************** enum event_kind *** 265,270 **** --- 265,274 ----
