HASHIMOTO Taiichi
taiic****@users*****
2007年 4月 9日 (月) 20:48:57 JST
Index: inline_patch/emacs-inline.patch
diff -u inline_patch/emacs-inline.patch:1.39 inline_patch/emacs-inline.patch:1.40
--- inline_patch/emacs-inline.patch:1.39 Sat Mar 10 11:37:25 2007
+++ inline_patch/emacs-inline.patch Mon Apr 9 20:48:57 2007
@@ -1,6 +1,6 @@
-diff -p -N -r -x '*.orig' ../emacs-20070308-0/lisp/loadup.el lisp/loadup.el
-*** ../emacs-20070308-0/lisp/loadup.el 2007-03-08 22:52:16.000000000 +0900
---- lisp/loadup.el 2007-03-08 22:52:47.000000000 +0900
+diff -p -N -r -x '*.orig' ../emacs-20070409-0/lisp/loadup.el lisp/loadup.el
+*** ../emacs-20070409-0/lisp/loadup.el 2007-04-09 20:40:49.000000000 +0900
+--- lisp/loadup.el 2007-04-09 20:41:51.000000000 +0900
***************
*** 207,212 ****
--- 207,215 ----
@@ -13,9 +13,9 @@
(message "%s" (garbage-collect))
(load "vc-hooks")
-diff -p -N -r -x '*.orig' ../emacs-20070308-0/lisp/term/mac-im.el lisp/term/mac-im.el
-*** ../emacs-20070308-0/lisp/term/mac-im.el 1970-01-01 09:00:00.000000000 +0900
---- lisp/term/mac-im.el 2007-03-10 10:28:16.000000000 +0900
+diff -p -N -r -x '*.orig' ../emacs-20070409-0/lisp/term/mac-im.el lisp/term/mac-im.el
+*** ../emacs-20070409-0/lisp/term/mac-im.el 1970-01-01 09:00:00.000000000 +0900
+--- lisp/term/mac-im.el 2007-04-09 20:41:51.000000000 +0900
***************
*** 0 ****
--- 1,209 ----
@@ -228,9 +228,9 @@
+ (define-key special-event-map
+ [mac-change-input-method] 'mac-handle-input-method-change)
+
-diff -p -N -r -x '*.orig' ../emacs-20070308-0/lisp/term/mac-win.el lisp/term/mac-win.el
-*** ../emacs-20070308-0/lisp/term/mac-win.el 2007-03-08 22:52:08.000000000 +0900
---- lisp/term/mac-win.el 2007-03-08 22:52:47.000000000 +0900
+diff -p -N -r -x '*.orig' ../emacs-20070409-0/lisp/term/mac-win.el lisp/term/mac-win.el
+*** ../emacs-20070409-0/lisp/term/mac-win.el 2007-04-09 20:40:41.000000000 +0900
+--- lisp/term/mac-win.el 2007-04-09 20:41:51.000000000 +0900
*************** either in the current buffer or in the e
*** 2086,2094 ****
(concat msg active-input-string)))
@@ -262,9 +262,9 @@
(overlay-put mac-ts-active-input-overlay 'before-string
active-input-string))
(mac-unread-string (funcall decode-fun confirmed coding)))
-diff -p -N -r -x '*.orig' ../emacs-20070308-0/src/Makefile.in src/Makefile.in
-*** ../emacs-20070308-0/src/Makefile.in 2007-03-08 22:51:50.000000000 +0900
---- src/Makefile.in 2007-03-08 22:52:48.000000000 +0900
+diff -p -N -r -x '*.orig' ../emacs-20070409-0/src/Makefile.in src/Makefile.in
+*** ../emacs-20070409-0/src/Makefile.in 2007-04-09 20:40:23.000000000 +0900
+--- src/Makefile.in 2007-04-09 20:44:30.000000000 +0900
*************** CYGWIN_OBJ = sheap.o
*** 574,580 ****
@@ -300,21 +300,21 @@
w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o
*************** macterm.o: blockinput.h atimer.h systime
-*** 1279,1284 ****
---- 1279,1288 ----
- 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) \
+*** 1286,1291 ****
+--- 1286,1295 ----
process.h coding.h $(config_h)
+ macselect.o: blockinput.h atimer.h systime.h macterm.h macgui.h frame.h \
+ keymap.h $(config_h)
+ macim.o: blockinput.h atimer.h systime.h syssignal.h macterm.h macgui.h \
+ 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)
- 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-20070308-0/src/keyboard.c src/keyboard.c
-*** ../emacs-20070308-0/src/keyboard.c 2007-03-08 22:51:50.000000000 +0900
---- src/keyboard.c 2007-03-08 22:52:48.000000000 +0900
+ mkdir -p $@
+diff -p -N -r -x '*.orig' ../emacs-20070409-0/src/keyboard.c src/keyboard.c
+*** ../emacs-20070409-0/src/keyboard.c 2007-04-09 20:40:23.000000000 +0900
+--- src/keyboard.c 2007-04-09 20:41:51.000000000 +0900
*************** Lisp_Object Qmouse_click;
*** 531,536 ****
--- 531,539 ----
@@ -328,8 +328,8 @@
Lisp_Object Qsave_session;
#ifdef MAC_OS
*************** kbd_buffer_get_event (kbp, used_mouse_me
-*** 4131,4136 ****
---- 4134,4148 ----
+*** 4151,4156 ****
+--- 4154,4168 ----
kbd_fetch_ptr = event + 1;
}
#endif
@@ -346,8 +346,8 @@
{
obj = Fcons (Qsave_session, Qnil);
*************** syms_of_keyboard ()
-*** 11168,11173 ****
---- 11180,11189 ----
+*** 11192,11197 ****
+--- 11204,11213 ----
Qlanguage_change = intern ("language-change");
staticpro (&Qlanguage_change);
#endif
@@ -358,9 +358,9 @@
Qdrag_n_drop = intern ("drag-n-drop");
staticpro (&Qdrag_n_drop);
-diff -p -N -r -x '*.orig' ../emacs-20070308-0/src/macim.c src/macim.c
-*** ../emacs-20070308-0/src/macim.c 1970-01-01 09:00:00.000000000 +0900
---- src/macim.c 2007-03-08 22:52:48.000000000 +0900
+diff -p -N -r -x '*.orig' ../emacs-20070409-0/src/macim.c src/macim.c
+*** ../emacs-20070409-0/src/macim.c 1970-01-01 09:00:00.000000000 +0900
+--- src/macim.c 2007-04-09 20:41:51.000000000 +0900
***************
*** 0 ****
--- 1,270 ----
@@ -634,11 +634,11 @@
+
+ #endif
+
-diff -p -N -r -x '*.orig' ../emacs-20070308-0/src/macterm.c src/macterm.c
-*** ../emacs-20070308-0/src/macterm.c 2007-03-08 22:51:50.000000000 +0900
---- src/macterm.c 2007-03-08 22:52:48.000000000 +0900
+diff -p -N -r -x '*.orig' ../emacs-20070409-0/src/macterm.c src/macterm.c
+*** ../emacs-20070409-0/src/macterm.c 2007-04-09 20:40:23.000000000 +0900
+--- src/macterm.c 2007-04-09 20:41:51.000000000 +0900
*************** XTread_socket (sd, expected, hold_quit)
-*** 11123,11129 ****
+*** 11132,11138 ****
normally. */
if (!(mapped_modifiers
& ~(mac_pass_command_to_system ? cmdKey : 0)
@@ -646,7 +646,7 @@
{
OSStatus err;
---- 11123,11131 ----
+--- 11132,11140 ----
normally. */
if (!(mapped_modifiers
& ~(mac_pass_command_to_system ? cmdKey : 0)
@@ -657,8 +657,8 @@
OSStatus err;
*************** XTread_socket (sd, expected, hold_quit)
-*** 11358,11363 ****
---- 11360,11366 ----
+*** 11367,11372 ****
+--- 11369,11375 ----
count++;
}
@@ -667,8 +667,8 @@
/* If the focus was just given to an autoraising frame,
*************** init_tsm ()
-*** 11722,11727 ****
---- 11725,11732 ----
+*** 11755,11760 ****
+--- 11758,11765 ----
NewTSMDocument (sizeof (types) / sizeof (types[0]), types,
&tsm_document_id, 0);
@@ -677,9 +677,9 @@
}
#endif
-diff -p -N -r -x '*.orig' ../emacs-20070308-0/src/termhooks.h src/termhooks.h
-*** ../emacs-20070308-0/src/termhooks.h 2007-03-08 22:51:51.000000000 +0900
---- src/termhooks.h 2007-03-08 22:52:48.000000000 +0900
+diff -p -N -r -x '*.orig' ../emacs-20070409-0/src/termhooks.h src/termhooks.h
+*** ../emacs-20070409-0/src/termhooks.h 2007-04-09 20:40:24.000000000 +0900
+--- src/termhooks.h 2007-04-09 20:41:51.000000000 +0900
*************** enum event_kind
*** 265,270 ****
--- 265,274 ----