(empty log message)
@@ -1,6 +1,6 @@ | ||
1 | -diff -r -p -x '*.elc' ../emacs-23.2.94-0/lisp/term/ns-win.el lisp/term/ns-win.el | |
2 | -*** ../emacs-23.2.94-0/lisp/term/ns-win.el 2011-01-27 05:35:09.000000000 +0900 | |
3 | ---- lisp/term/ns-win.el 2011-02-28 13:08:01.000000000 +0900 | |
1 | +diff -r -p -x '*.elc' ../emacs-23.3-0-lion/lisp/term/ns-win.el lisp/term/ns-win.el | |
2 | +*** ../emacs-23.3-0-lion/lisp/term/ns-win.el 2011-12-05 16:49:13.000000000 +0900 | |
3 | +--- lisp/term/ns-win.el 2011-12-04 17:01:12.000000000 +0900 | |
4 | 4 | *************** The properties returned may include `top |
5 | 5 | *** 317,322 **** |
6 | 6 | --- 317,323 ---- |
@@ -559,9 +559,9 @@ | ||
559 | 559 | (provide 'ns-win) |
560 | 560 | |
561 | 561 | ;; arch-tag: eb138a45-4e2e-4d68-b1c9-a39665731644 |
562 | -diff -r -p -N -x '*.o' ../emacs-23.2.94-0/src/Makefile.in src/Makefile.in | |
563 | -*** ../emacs-23.2.94-0/src/Makefile.in 2011-01-09 02:45:14.000000000 +0900 | |
564 | ---- src/Makefile.in 2011-02-15 22:24:06.000000000 +0900 | |
562 | +diff -r -p -N -x '*.o' ../emacs-23.3-0-lion/src/Makefile.in src/Makefile.in | |
563 | +*** ../emacs-23.3-0-lion/src/Makefile.in 2011-12-05 16:49:13.000000000 +0900 | |
564 | +--- src/Makefile.in 2011-12-04 17:01:12.000000000 +0900 | |
565 | 565 | *************** ns_appresdir=@ns_appresdir@/ |
566 | 566 | *** 545,551 **** |
567 | 567 | ns_appsrc=@ns_appsrc@ |
@@ -606,9 +606,9 @@ | ||
606 | 606 | process.o: process.c process.h buffer.h window.h termhooks.h termopts.h \ |
607 | 607 | commands.h syssignal.h systime.h systty.h syswait.h frame.h dispextern.h \ |
608 | 608 | blockinput.h atimer.h charset.h coding.h ccl.h msdos.h composite.h \ |
609 | -diff -r -p -N -x '*.o' ../emacs-23.2.94-0/src/keyboard.c src/keyboard.c | |
610 | -*** ../emacs-23.2.94-0/src/keyboard.c 2011-01-29 05:22:59.000000000 +0900 | |
611 | ---- src/keyboard.c 2011-02-15 22:24:06.000000000 +0900 | |
609 | +diff -r -p -N -x '*.o' ../emacs-23.3-0-lion/src/keyboard.c src/keyboard.c | |
610 | +*** ../emacs-23.3-0-lion/src/keyboard.c 2011-12-05 16:49:13.000000000 +0900 | |
611 | +--- src/keyboard.c 2011-12-04 17:01:12.000000000 +0900 | |
612 | 612 | *************** kbd_buffer_get_event (kbp, used_mouse_me |
613 | 613 | *** 4243,4250 **** |
614 | 614 | { |
@@ -641,9 +641,9 @@ | ||
641 | 641 | /* Here we used to use `ignore-event' which would simple set prefix-arg to |
642 | 642 | current-prefix-arg, as is done in `handle-switch-frame'. |
643 | 643 | But `handle-switch-frame is not run from the special-map. |
644 | -diff -r -p -N -x '*.o' ../emacs-23.2.94-0/src/macim.m src/macim.m | |
645 | -*** ../emacs-23.2.94-0/src/macim.m 1970-01-01 09:00:00.000000000 +0900 | |
646 | ---- src/macim.m 2011-02-28 10:27:05.000000000 +0900 | |
644 | +diff -r -p -N -x '*.o' ../emacs-23.3-0-lion/src/macim.m src/macim.m | |
645 | +*** ../emacs-23.3-0-lion/src/macim.m 1970-01-01 09:00:00.000000000 +0900 | |
646 | +--- src/macim.m 2011-12-04 17:01:12.000000000 +0900 | |
647 | 647 | *************** |
648 | 648 | *** 0 **** |
649 | 649 | --- 1,178 ---- |
@@ -825,9 +825,9 @@ | ||
825 | 825 | + defsubr (&Smac_toggle_input_source); |
826 | 826 | + } |
827 | 827 | + #endif |
828 | -diff -r -p -N -x '*.o' ../emacs-23.2.94-0/src/nsfns.m src/nsfns.m | |
829 | -*** ../emacs-23.2.94-0/src/nsfns.m 2011-01-09 02:45:14.000000000 +0900 | |
830 | ---- src/nsfns.m 2011-02-15 22:24:06.000000000 +0900 | |
828 | +diff -r -p -N -x '*.o' ../emacs-23.3-0-lion/src/nsfns.m src/nsfns.m | |
829 | +*** ../emacs-23.3-0-lion/src/nsfns.m 2011-12-05 16:49:13.000000000 +0900 | |
830 | +--- src/nsfns.m 2011-12-04 17:01:12.000000000 +0900 | |
831 | 831 | *************** Lisp_Object Fx_open_connection (Lisp_Obj |
832 | 832 | *** 103,108 **** |
833 | 833 | --- 103,113 ---- |
@@ -882,9 +882,9 @@ | ||
882 | 882 | /* used only in fontset.c */ |
883 | 883 | check_window_system_func = check_ns; |
884 | 884 | |
885 | -diff -r -p -N -x '*.o' ../emacs-23.2.94-0/src/nsterm.h src/nsterm.h | |
886 | -*** ../emacs-23.2.94-0/src/nsterm.h 2011-01-09 02:45:14.000000000 +0900 | |
887 | ---- src/nsterm.h 2011-02-15 22:24:06.000000000 +0900 | |
885 | +diff -r -p -N -x '*.o' ../emacs-23.3-0-lion/src/nsterm.h src/nsterm.h | |
886 | +*** ../emacs-23.3-0-lion/src/nsterm.h 2011-12-05 16:49:13.000000000 +0900 | |
887 | +--- src/nsterm.h 2011-12-04 17:01:12.000000000 +0900 | |
888 | 888 | *************** typedef unsigned int NSUInteger; |
889 | 889 | *** 365,370 **** |
890 | 890 | --- 365,372 ---- |
@@ -896,9 +896,9 @@ | ||
896 | 896 | |
897 | 897 | /* could use list to store these, but rest of emacs has a big infrastructure |
898 | 898 | for managing a table of bitmap "records" */ |
899 | -diff -r -p -N -x '*.o' ../emacs-23.2.94-0/src/nsterm.m src/nsterm.m | |
900 | -*** ../emacs-23.2.94-0/src/nsterm.m 2011-02-09 08:46:22.000000000 +0900 | |
901 | ---- src/nsterm.m 2011-02-15 22:24:06.000000000 +0900 | |
899 | +diff -r -p -N -x '*.o' ../emacs-23.3-0-lion/src/nsterm.m src/nsterm.m | |
900 | +*** ../emacs-23.3-0-lion/src/nsterm.m 2011-12-05 16:50:06.000000000 +0900 | |
901 | +--- src/nsterm.m 2011-12-04 17:01:12.000000000 +0900 | |
902 | 902 | *************** ns_term_init (Lisp_Object display_name) |
903 | 903 | *** 3730,3735 **** |
904 | 904 | --- 3730,3738 ---- |
@@ -1088,9 +1088,9 @@ | ||
1088 | 1088 | |
1089 | 1089 | pt = [self convertPoint: pt toView: nil]; |
1090 | 1090 | pt = [[self window] convertBaseToScreen: pt]; |
1091 | -diff -r -p -N -x '*.o' ../emacs-23.2.94-0/src/s/darwin.h src/s/darwin.h | |
1092 | -*** ../emacs-23.2.94-0/src/s/darwin.h 2011-01-09 02:45:14.000000000 +0900 | |
1093 | ---- src/s/darwin.h 2011-02-15 22:24:06.000000000 +0900 | |
1091 | +diff -r -p -N -x '*.o' ../emacs-23.3-0-lion/src/s/darwin.h src/s/darwin.h | |
1092 | +*** ../emacs-23.3-0-lion/src/s/darwin.h 2011-12-05 16:49:29.000000000 +0900 | |
1093 | +--- src/s/darwin.h 2011-12-04 17:01:12.000000000 +0900 | |
1094 | 1094 | *************** along with GNU Emacs. If not, see <http |
1095 | 1095 | *** 163,169 **** |
1096 | 1096 | /* Definitions for how to compile & link. */ |
@@ -1,3 +1,8 @@ | ||
1 | +2011-12-04 HASHIMOTO Taiichi <taiichi2@mac.com> | |
2 | + | |
3 | + * src/macim.m: 三代川さんのパッチを取り込み.localeの取得方法の変更. | |
4 | + * src/macim.m: OMOTOさんのパッチを取り込み.Atok23,24へ対応. | |
5 | + | |
1 | 6 | 2011-03-21 HASHIMOTO Taiichi <taiichi2@mac.com> |
2 | 7 | |
3 | 8 | * font.patch (nsfont.m): バグを修正 |
@@ -1,3 +1,15 @@ | ||
1 | -emacs-inline.patch: patch for input method | |
2 | -font.patch: patch to fix trembling font when user inputs japanese by input method | |
3 | -xcode4.patch: patch to compile by xcode4 (gcc-4.2 64bit) | |
1 | +* Files | |
2 | + | |
3 | +** emacs-inline.patch: patch for input method | |
4 | +** font.patch: patch to fix trembling font when user inputs japanese by input method | |
5 | +** xcode4.patch: patch to compile by xcode4 (gcc-4.2 64bit) | |
6 | +** lion.patch: patch to compile on MacOSX 10.7. It contains xcode4.patch. | |
7 | + | |
8 | +* Usage | |
9 | + | |
10 | +[MaxOSX 10.7 (Lion)] | |
11 | +% cd emacs-23.3 | |
12 | +% patch -p0 < lion.patch | |
13 | +% patch -p0 < emacs-inline.patch | |
14 | +% patch -p0 < font.patch | |
15 | + |