svnno****@sourc*****
svnno****@sourc*****
2011年 12月 5日 (月) 17:03:52 JST
Revision: 575
http://sourceforge.jp/projects/macemacsjp/svn/view?view=rev&revision=575
Author: taiichi
Date: 2011-12-05 17:03:51 +0900 (Mon, 05 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
inline_patch/trunk/ChangeLog
inline_patch/trunk/README
inline_patch/trunk/emacs-inline.patch
-------------- next part --------------
Modified: inline_patch/trunk/ChangeLog
===================================================================
--- inline_patch/trunk/ChangeLog 2011-03-21 08:13:35 UTC (rev 574)
+++ inline_patch/trunk/ChangeLog 2011-12-05 08:03:51 UTC (rev 575)
@@ -1,3 +1,8 @@
+2011-12-04 HASHIMOTO Taiichi <taiic****@mac*****>
+
+ * src/macim.m: 三代川さんのパッチを取り込み．localeの取得方法の変更．
+ * src/macim.m: OMOTOさんのパッチを取り込み．Atok23,24へ対応．
+
2011-03-21 HASHIMOTO Taiichi <taiic****@mac*****>
* font.patch (nsfont.m): バグを修正
Modified: inline_patch/trunk/README
===================================================================
--- inline_patch/trunk/README 2011-03-21 08:13:35 UTC (rev 574)
+++ inline_patch/trunk/README 2011-12-05 08:03:51 UTC (rev 575)
@@ -1,3 +1,15 @@
-emacs-inline.patch: patch for input method
-font.patch: patch to fix trembling font when user inputs japanese by input method
-xcode4.patch: patch to compile by xcode4 (gcc-4.2 64bit)
+* Files
+
+** emacs-inline.patch: patch for input method
+** font.patch: patch to fix trembling font when user inputs japanese by input method
+** xcode4.patch: patch to compile by xcode4 (gcc-4.2 64bit)
+** lion.patch: patch to compile on MacOSX 10.7. It contains xcode4.patch.
+
+* Usage
+
+[MaxOSX 10.7 (Lion)]
+% cd emacs-23.3
+% patch -p0 < lion.patch
+% patch -p0 < emacs-inline.patch
+% patch -p0 < font.patch
+
Modified: inline_patch/trunk/emacs-inline.patch
===================================================================
--- inline_patch/trunk/emacs-inline.patch 2011-03-21 08:13:35 UTC (rev 574)
+++ inline_patch/trunk/emacs-inline.patch 2011-12-05 08:03:51 UTC (rev 575)
@@ -1,6 +1,6 @@
-diff -r -p -x '*.elc' ../emacs-23.2.94-0/lisp/term/ns-win.el lisp/term/ns-win.el
-*** ../emacs-23.2.94-0/lisp/term/ns-win.el 2011-01-27 05:35:09.000000000 +0900
---- lisp/term/ns-win.el 2011-02-28 13:08:01.000000000 +0900
+diff -r -p -x '*.elc' ../emacs-23.3-0-lion/lisp/term/ns-win.el lisp/term/ns-win.el
+*** ../emacs-23.3-0-lion/lisp/term/ns-win.el 2011-12-05 16:49:13.000000000 +0900
+--- lisp/term/ns-win.el 2011-12-04 17:01:12.000000000 +0900
*************** The properties returned may include `top
*** 317,322 ****
--- 317,323 ----
@@ -559,9 +559,9 @@
(provide 'ns-win)
;; arch-tag: eb138a45-4e2e-4d68-b1c9-a39665731644
-diff -r -p -N -x '*.o' ../emacs-23.2.94-0/src/Makefile.in src/Makefile.in
-*** ../emacs-23.2.94-0/src/Makefile.in 2011-01-09 02:45:14.000000000 +0900
---- src/Makefile.in 2011-02-15 22:24:06.000000000 +0900
+diff -r -p -N -x '*.o' ../emacs-23.3-0-lion/src/Makefile.in src/Makefile.in
+*** ../emacs-23.3-0-lion/src/Makefile.in 2011-12-05 16:49:13.000000000 +0900
+--- src/Makefile.in 2011-12-04 17:01:12.000000000 +0900
*************** ns_appresdir=@ns_appresdir@/
*** 545,551 ****
ns_appsrc=@ns_appsrc@
@@ -606,9 +606,9 @@
process.o: process.c process.h buffer.h window.h termhooks.h termopts.h \
commands.h syssignal.h systime.h systty.h syswait.h frame.h dispextern.h \
blockinput.h atimer.h charset.h coding.h ccl.h msdos.h composite.h \
-diff -r -p -N -x '*.o' ../emacs-23.2.94-0/src/keyboard.c src/keyboard.c
-*** ../emacs-23.2.94-0/src/keyboard.c 2011-01-29 05:22:59.000000000 +0900
---- src/keyboard.c 2011-02-15 22:24:06.000000000 +0900
+diff -r -p -N -x '*.o' ../emacs-23.3-0-lion/src/keyboard.c src/keyboard.c
+*** ../emacs-23.3-0-lion/src/keyboard.c 2011-12-05 16:49:13.000000000 +0900
+--- src/keyboard.c 2011-12-04 17:01:12.000000000 +0900
*************** kbd_buffer_get_event (kbp, used_mouse_me
*** 4243,4250 ****
{
@@ -641,9 +641,9 @@
/* Here we used to use `ignore-event' which would simple set prefix-arg to
current-prefix-arg, as is done in `handle-switch-frame'.
But `handle-switch-frame is not run from the special-map.
-diff -r -p -N -x '*.o' ../emacs-23.2.94-0/src/macim.m src/macim.m
-*** ../emacs-23.2.94-0/src/macim.m 1970-01-01 09:00:00.000000000 +0900
---- src/macim.m 2011-02-28 10:27:05.000000000 +0900
+diff -r -p -N -x '*.o' ../emacs-23.3-0-lion/src/macim.m src/macim.m
+*** ../emacs-23.3-0-lion/src/macim.m 1970-01-01 09:00:00.000000000 +0900
+--- src/macim.m 2011-12-04 17:01:12.000000000 +0900
***************
*** 0 ****
--- 1,178 ----
@@ -825,9 +825,9 @@
+ defsubr (&Smac_toggle_input_source);
+ }
+ #endif
-diff -r -p -N -x '*.o' ../emacs-23.2.94-0/src/nsfns.m src/nsfns.m
-*** ../emacs-23.2.94-0/src/nsfns.m 2011-01-09 02:45:14.000000000 +0900
---- src/nsfns.m 2011-02-15 22:24:06.000000000 +0900
+diff -r -p -N -x '*.o' ../emacs-23.3-0-lion/src/nsfns.m src/nsfns.m
+*** ../emacs-23.3-0-lion/src/nsfns.m 2011-12-05 16:49:13.000000000 +0900
+--- src/nsfns.m 2011-12-04 17:01:12.000000000 +0900
*************** Lisp_Object Fx_open_connection (Lisp_Obj
*** 103,108 ****
--- 103,113 ----
@@ -882,9 +882,9 @@
/* used only in fontset.c */
check_window_system_func = check_ns;
-diff -r -p -N -x '*.o' ../emacs-23.2.94-0/src/nsterm.h src/nsterm.h
-*** ../emacs-23.2.94-0/src/nsterm.h 2011-01-09 02:45:14.000000000 +0900
---- src/nsterm.h 2011-02-15 22:24:06.000000000 +0900
+diff -r -p -N -x '*.o' ../emacs-23.3-0-lion/src/nsterm.h src/nsterm.h
+*** ../emacs-23.3-0-lion/src/nsterm.h 2011-12-05 16:49:13.000000000 +0900
+--- src/nsterm.h 2011-12-04 17:01:12.000000000 +0900
*************** typedef unsigned int NSUInteger;
*** 365,370 ****
--- 365,372 ----
@@ -896,9 +896,9 @@
/* could use list to store these, but rest of emacs has a big infrastructure
for managing a table of bitmap "records" */
-diff -r -p -N -x '*.o' ../emacs-23.2.94-0/src/nsterm.m src/nsterm.m
-*** ../emacs-23.2.94-0/src/nsterm.m 2011-02-09 08:46:22.000000000 +0900
---- src/nsterm.m 2011-02-15 22:24:06.000000000 +0900
+diff -r -p -N -x '*.o' ../emacs-23.3-0-lion/src/nsterm.m src/nsterm.m
+*** ../emacs-23.3-0-lion/src/nsterm.m 2011-12-05 16:50:06.000000000 +0900
+--- src/nsterm.m 2011-12-04 17:01:12.000000000 +0900
*************** ns_term_init (Lisp_Object display_name)
*** 3730,3735 ****
--- 3730,3738 ----
@@ -1088,9 +1088,9 @@
pt = [self convertPoint: pt toView: nil];
pt = [[self window] convertBaseToScreen: pt];
-diff -r -p -N -x '*.o' ../emacs-23.2.94-0/src/s/darwin.h src/s/darwin.h
-*** ../emacs-23.2.94-0/src/s/darwin.h 2011-01-09 02:45:14.000000000 +0900
---- src/s/darwin.h 2011-02-15 22:24:06.000000000 +0900
+diff -r -p -N -x '*.o' ../emacs-23.3-0-lion/src/s/darwin.h src/s/darwin.h
+*** ../emacs-23.3-0-lion/src/s/darwin.h 2011-12-05 16:49:29.000000000 +0900
+--- src/s/darwin.h 2011-12-04 17:01:12.000000000 +0900
*************** along with GNU Emacs. If not, see <http
*** 163,169 ****
/* Definitions for how to compile & link. */