HASHIMOTO Taiichi
taiic****@users*****
2006年 3月 17日 (金) 16:12:20 JST
Index: inline_patch/emacs-inline.patch
diff -u inline_patch/emacs-inline.patch:1.25 inline_patch/emacs-inline.patch:1.26
--- inline_patch/emacs-inline.patch:1.25 Fri Mar 17 16:05:39 2006
+++ inline_patch/emacs-inline.patch Fri Mar 17 16:12:20 2006
@@ -1,6 +1,6 @@
-diff -prN -x '*.orig' ../emacs-20060313-0/lisp/loadup.el lisp/loadup.el
-*** ../emacs-20060313-0/lisp/loadup.el Mon Mar 13 13:37:39 2006
---- lisp/loadup.el Mon Mar 13 18:46:19 2006
+diff -prN -x '*.orig' ../emacs-20060316-0/lisp/loadup.el lisp/loadup.el
+*** ../emacs-20060316-0/lisp/loadup.el Fri Mar 17 16:09:25 2006
+--- lisp/loadup.el Fri Mar 17 16:09:56 2006
***************
*** 206,211 ****
--- 206,214 ----
@@ -13,9 +13,9 @@
(message "%s" (garbage-collect))
(load "vc-hooks")
-diff -prN -x '*.orig' ../emacs-20060313-0/lisp/term/mac-im.el lisp/term/mac-im.el
-*** ../emacs-20060313-0/lisp/term/mac-im.el Thu Jan 1 09:00:00 1970
---- lisp/term/mac-im.el Fri Mar 17 15:34:11 2006
+diff -prN -x '*.orig' ../emacs-20060316-0/lisp/term/mac-im.el lisp/term/mac-im.el
+*** ../emacs-20060316-0/lisp/term/mac-im.el Thu Jan 1 09:00:00 1970
+--- lisp/term/mac-im.el Fri Mar 17 16:09:56 2006
***************
*** 0 ****
--- 1,343 ----
@@ -362,9 +362,9 @@
+ (define-key special-event-map
+ [mac-change-input-method] 'mac-handle-input-method-change)
+
-diff -prN -x '*.orig' ../emacs-20060313-0/src/Makefile.in src/Makefile.in
-*** ../emacs-20060313-0/src/Makefile.in Mon Mar 13 13:37:44 2006
---- src/Makefile.in Mon Mar 13 18:46:19 2006
+diff -prN -x '*.orig' ../emacs-20060316-0/src/Makefile.in src/Makefile.in
+*** ../emacs-20060316-0/src/Makefile.in Fri Mar 17 16:09:30 2006
+--- src/Makefile.in Fri Mar 17 16:09:56 2006
*************** CYGWIN_OBJ = sheap.o
*** 568,574 ****
@@ -412,9 +412,9 @@
macselect.o: blockinput.h macterm.h macgui.h frame.h keymap.h $(config_h)
${emacsapp}Contents/Resources/English.lproj:
-diff -prN -x '*.orig' ../emacs-20060313-0/src/keyboard.c src/keyboard.c
-*** ../emacs-20060313-0/src/keyboard.c Mon Mar 13 13:37:44 2006
---- src/keyboard.c Mon Mar 13 18:46:19 2006
+diff -prN -x '*.orig' ../emacs-20060316-0/src/keyboard.c src/keyboard.c
+*** ../emacs-20060316-0/src/keyboard.c Fri Mar 17 16:09:30 2006
+--- src/keyboard.c Fri Mar 17 16:09:57 2006
*************** Lisp_Object Qmouse_click;
*** 528,533 ****
--- 528,537 ----
@@ -468,9 +468,9 @@
Qdrag_n_drop = intern ("drag-n-drop");
staticpro (&Qdrag_n_drop);
-diff -prN -x '*.orig' ../emacs-20060313-0/src/macim.c src/macim.c
-*** ../emacs-20060313-0/src/macim.c Thu Jan 1 09:00:00 1970
---- src/macim.c Fri Mar 17 13:08:10 2006
+diff -prN -x '*.orig' ../emacs-20060316-0/src/macim.c src/macim.c
+*** ../emacs-20060316-0/src/macim.c Thu Jan 1 09:00:00 1970
+--- src/macim.c Fri Mar 17 16:09:57 2006
***************
*** 0 ****
--- 1,449 ----
@@ -923,11 +923,11 @@
+
+ #endif
+
-diff -prN -x '*.orig' ../emacs-20060313-0/src/macterm.c src/macterm.c
-*** ../emacs-20060313-0/src/macterm.c Mon Mar 13 13:37:44 2006
---- src/macterm.c Wed Mar 15 18:20:01 2006
+diff -prN -x '*.orig' ../emacs-20060316-0/src/macterm.c src/macterm.c
+*** ../emacs-20060316-0/src/macterm.c Fri Mar 17 16:09:30 2006
+--- src/macterm.c Fri Mar 17 16:09:57 2006
*************** static unsigned char keycode_to_xkeysym_
-*** 9622,9629 ****
+*** 9731,9738 ****
/*0x5C*/ 0xb9 /*kp-9*/, 0, 0, 0,
/*0x60*/ 0xc2 /*f5*/, 0xc3 /*f6*/, 0xc4 /*f7*/, 0xc0 /*f3*/,
@@ -936,7 +936,7 @@
/*0x6C*/ 0, 0xc7 /*f10*/, 0x0a /*fn+enter on laptops*/, 0xc9 /*f12*/,
/*0x70*/ 0, 0xcc /*f15*/, 0x6a /*help*/, 0x50 /*home*/,
---- 9622,9629 ----
+--- 9731,9738 ----
/*0x5C*/ 0xb9 /*kp-9*/, 0, 0, 0,
/*0x60*/ 0xc2 /*f5*/, 0xc3 /*f6*/, 0xc4 /*f7*/, 0xc0 /*f3*/,
@@ -946,8 +946,8 @@
/*0x70*/ 0, 0xcc /*f15*/, 0x6a /*help*/, 0x50 /*home*/,
*************** XTread_socket (sd, expected, hold_quit)
-*** 10298,10303 ****
---- 10298,10304 ----
+*** 10407,10412 ****
+--- 10407,10413 ----
int keycode = (er.message & keyCodeMask) >> 8;
int xkeysym;
@@ -956,8 +956,8 @@
/* When using Carbon Events, we need to pass raw keyboard
events to the TSM ourselves. If TSM handles it, it
*************** XTread_socket (sd, expected, hold_quit)
-*** 10314,10319 ****
---- 10315,10321 ----
+*** 10423,10428 ****
+--- 10424,10430 ----
!= eventNotHandledErr)
break;
#endif
@@ -966,8 +966,8 @@
#if 0
if (dpyinfo->x_focus_frame == NULL)
*************** XTread_socket (sd, expected, hold_quit)
-*** 10380,10385 ****
---- 10382,10409 ----
+*** 10489,10494 ****
+--- 10491,10518 ----
er.message & charCodeMask);
inev.kind = ASCII_KEYSTROKE_EVENT;
}
@@ -997,8 +997,8 @@
#if USE_CARBON_EVENTS
*************** XTread_socket (sd, expected, hold_quit)
-*** 10437,10442 ****
---- 10461,10467 ----
+*** 10546,10551 ****
+--- 10570,10576 ----
count++;
}
@@ -1007,8 +1007,8 @@
/* If the focus was just given to an autoraising frame,
*************** mac_initialize ()
-*** 10953,10958 ****
---- 10978,10985 ----
+*** 11067,11072 ****
+--- 11092,11099 ----
init_service_handler ();
init_quit_char_handler ();
@@ -1017,9 +1017,9 @@
#endif /* MAC_OSX */
init_command_handler ();
-diff -prN -x '*.orig' ../emacs-20060313-0/src/termhooks.h src/termhooks.h
-*** ../emacs-20060313-0/src/termhooks.h Mon Mar 13 13:37:45 2006
---- src/termhooks.h Mon Mar 13 18:46:19 2006
+diff -prN -x '*.orig' ../emacs-20060316-0/src/termhooks.h src/termhooks.h
+*** ../emacs-20060316-0/src/termhooks.h Fri Mar 17 16:09:30 2006
+--- src/termhooks.h Fri Mar 17 16:09:57 2006
*************** enum event_kind
*** 260,265 ****
--- 260,271 ----