svnno****@sourc*****
svnno****@sourc*****
2010年 4月 12日 (月) 15:56:22 JST
Revision: 568
http://sourceforge.jp/projects/macemacsjp/svn/view?view=rev&revision=568
Author: taiichi
Date: 2010-04-12 15:56:22 +0900 (Mon, 12 Apr 2010)
Log Message:
-----------
Modified Paths:
--------------
inline_patch/trunk/ChangeLog
inline_patch/trunk/emacs-inline.patch
-------------- next part --------------
Modified: inline_patch/trunk/ChangeLog
===================================================================
--- inline_patch/trunk/ChangeLog 2010-04-07 11:15:08 UTC (rev 567)
+++ inline_patch/trunk/ChangeLog 2010-04-12 06:56:22 UTC (rev 568)
@@ -1,3 +1,7 @@
+2010-04-12 HASHIMOTO Taiichi <taiic****@mac*****>
+
+ * src/macim.c: NSString ‚Ì cString ƒƒ\ƒbƒh‚ð UTF8String ‚É•ÏXD
+
2010-04-07 HASHIMOTO Taiichi <taiic****@mac*****>
* src/Makefile.in: pretest 23.1.95 ‚ɑΉžD
Modified: inline_patch/trunk/emacs-inline.patch
===================================================================
--- inline_patch/trunk/emacs-inline.patch 2010-04-07 11:15:08 UTC (rev 567)
+++ inline_patch/trunk/emacs-inline.patch 2010-04-12 06:56:22 UTC (rev 568)
@@ -547,7 +547,7 @@
;; arch-tag: eb138a45-4e2e-4d68-b1c9-a39665731644
diff -p -N -r -x '*.orig' ../emacs-23.1.95/src/Makefile.in src/Makefile.in
*** ../emacs-23.1.95/src/Makefile.in 2010-03-29 04:08:24.000000000 +0900
---- src/Makefile.in 2010-04-03 21:50:20.000000000 +0900
+--- src/Makefile.in 2010-04-06 22:38:39.000000000 +0900
*************** ns_appresdir=@ns_appresdir@/
*** 542,548 ****
ns_appsrc=@ns_appsrc@
@@ -594,7 +594,7 @@
blockinput.h atimer.h charset.h coding.h ccl.h msdos.h composite.h \
diff -p -N -r -x '*.orig' ../emacs-23.1.95/src/keyboard.c src/keyboard.c
*** ../emacs-23.1.95/src/keyboard.c 2010-03-11 11:20:27.000000000 +0900
---- src/keyboard.c 2010-04-03 21:49:10.000000000 +0900
+--- src/keyboard.c 2010-04-06 22:38:39.000000000 +0900
*************** kbd_buffer_get_event (kbp, used_mouse_me
*** 4195,4202 ****
{
@@ -629,10 +629,10 @@
But `handle-switch-frame is not run from the special-map.
diff -p -N -r -x '*.orig' ../emacs-23.1.95/src/macim.m src/macim.m
*** ../emacs-23.1.95/src/macim.m 1970-01-01 09:00:00.000000000 +0900
---- src/macim.m 2010-04-03 21:49:10.000000000 +0900
+--- src/macim.m 2010-04-12 15:31:22.000000000 +0900
***************
*** 0 ****
---- 1,176 ----
+--- 1,178 ----
+ /* Implementation of Input Method Extension for MacOS X.
+ Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
+ Taiichi Hashimoto <taiic****@mac*****>.
@@ -702,7 +702,8 @@
+ for (i = 0; i < list_size; i++) {
+ TISInputSourceRef is = [is_list objectAtIndex:i];
+ NSString *id = (NSString *)TISGetInputSourceProperty(is, kTISPropertyInputSourceID);
-+ list[i] = make_string([id cString], [id length]);
++ list[i] = make_string([id UTF8String],
++ [id lengthOfBytesUsingEncoding:NSUTF8StringEncoding]);
+ }
+
+ return Flist(list_size, list);
@@ -716,7 +717,8 @@
+ TISInputSourceRef is = TISCopyCurrentKeyboardInputSource();
+ NSString *id = (NSString *)TISGetInputSourceProperty(is, kTISPropertyInputSourceID);
+
-+ return make_string([id cString], [id length]);
++ return make_string([id UTF8String],
++ [id lengthOfBytesUsingEncoding:NSUTF8StringEncoding]);
+ }
+
+ DEFUN ("mac-toggle-input-source", Fmac_toggle_input_source,
@@ -811,7 +813,7 @@
+ #endif
diff -p -N -r -x '*.orig' ../emacs-23.1.95/src/nsfns.m src/nsfns.m
*** ../emacs-23.1.95/src/nsfns.m 2010-03-31 23:24:32.000000000 +0900
---- src/nsfns.m 2010-04-03 21:49:10.000000000 +0900
+--- src/nsfns.m 2010-04-06 22:38:39.000000000 +0900
*************** Lisp_Object Fx_open_connection (Lisp_Obj
*** 103,108 ****
--- 103,113 ----
@@ -868,7 +870,7 @@
diff -p -N -r -x '*.orig' ../emacs-23.1.95/src/nsterm.h src/nsterm.h
*** ../emacs-23.1.95/src/nsterm.h 2010-03-31 23:24:49.000000000 +0900
---- src/nsterm.h 2010-04-03 21:49:10.000000000 +0900
+--- src/nsterm.h 2010-04-06 22:38:39.000000000 +0900
*************** typedef unsigned int NSUInteger;
*** 365,370 ****
--- 365,372 ----
@@ -882,7 +884,7 @@
for managing a table of bitmap "records" */
diff -p -N -r -x '*.orig' ../emacs-23.1.95/src/nsterm.m src/nsterm.m
*** ../emacs-23.1.95/src/nsterm.m 2010-03-30 08:28:49.000000000 +0900
---- src/nsterm.m 2010-04-03 21:49:10.000000000 +0900
+--- src/nsterm.m 2010-04-06 22:38:39.000000000 +0900
*************** ns_term_init (Lisp_Object display_name)
*** 3705,3710 ****
--- 3705,3713 ----
@@ -1080,7 +1082,7 @@
pt = [[self window] convertBaseToScreen: pt];
diff -p -N -r -x '*.orig' ../emacs-23.1.95/src/s/darwin.h src/s/darwin.h
*** ../emacs-23.1.95/src/s/darwin.h 2010-03-11 11:20:25.000000000 +0900
---- src/s/darwin.h 2010-04-03 21:49:10.000000000 +0900
+--- src/s/darwin.h 2010-04-06 22:38:39.000000000 +0900
*************** along with GNU Emacs. If not, see <http
*** 145,151 ****
/* Definitions for how to compile & link. */