svnno****@sourc*****
svnno****@sourc*****
2012年 1月 13日 (金) 08:57:37 JST
Revision: 579
http://sourceforge.jp/projects/macemacsjp/svn/view?view=rev&revision=579
Author: taiichi
Date: 2012-01-13 08:57:36 +0900 (Fri, 13 Jan 2012)
Log Message:
-----------
Modified Paths:
--------------
inline_patch/trunk/emacs-inline.patch
-------------- next part --------------
Modified: inline_patch/trunk/emacs-inline.patch
===================================================================
--- inline_patch/trunk/emacs-inline.patch 2011-12-05 10:34:53 UTC (rev 578)
+++ inline_patch/trunk/emacs-inline.patch 2012-01-12 23:57:36 UTC (rev 579)
@@ -1,6 +1,6 @@
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
+--- lisp/term/ns-win.el 2012-01-13 08:55:10.000000000 +0900
*************** The properties returned may include `top
*** 317,322 ****
--- 317,323 ----
@@ -171,7 +171,7 @@
;; Still alive?
*************** the operating system.")
*** 1267,1272 ****
---- 1345,1731 ----
+--- 1345,1771 ----
(add-to-list 'window-system-initialization-alist '(ns . ns-initialize-window-system))
@@ -355,6 +355,46 @@
+ (title . "半英")
+ (cursor-color)
+ (cursor-type))
++ ("com.justsystems.inputmethod.atok23.Roman"
++ (title . "A")
++ (cursor-color)
++ (cursor-type))
++ ("com.justsystems.inputmethod.atok23.Japanese"
++ (title . "あ")
++ (cursor-color)
++ (cursor-type))
++ ("com.justsystems.inputmethod.atok23.Japanese.Katakana"
++ (title . "ア")
++ (cursor-color)
++ (cursor-type))
++ ("com.justsystems.inputmethod.atok23.Japanese.FullWidthRoman"
++ (title . "英")
++ (cursor-color)
++ (cursor-type))
++ ("com.justsystems.inputmethod.atok23.Japanese.HalfWidthEiji"
++ (title . "半英")
++ (cursor-color)
++ (cursor-type))
++ ("com.justsystems.inputmethod.atok24.Roman"
++ (title . "A")
++ (cursor-color)
++ (cursor-type))
++ ("com.justsystems.inputmethod.atok24.Japanese"
++ (title . "あ")
++ (cursor-color)
++ (cursor-type))
++ ("com.justsystems.inputmethod.atok24.Japanese.Katakana"
++ (title . "ア")
++ (cursor-color)
++ (cursor-type))
++ ("com.justsystems.inputmethod.atok24.Japanese.FullWidthRoman"
++ (title . "英")
++ (cursor-color)
++ (cursor-type))
++ ("com.justsystems.inputmethod.atok24.Japanese.HalfWidthEiji"
++ (title . "半英")
++ (cursor-color)
++ (cursor-type))
+ )
+ "Alist of Mac script code vs parameters for input method on MacOSX.")
+
@@ -561,7 +601,7 @@
;; arch-tag: eb138a45-4e2e-4d68-b1c9-a39665731644
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
+--- src/Makefile.in 2012-01-13 08:53:57.000000000 +0900
*************** ns_appresdir=@ns_appresdir@/
*** 545,551 ****
ns_appsrc=@ns_appsrc@
@@ -608,7 +648,7 @@
blockinput.h atimer.h charset.h coding.h ccl.h msdos.h composite.h \
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
+--- src/keyboard.c 2012-01-13 08:53:57.000000000 +0900
*************** kbd_buffer_get_event (kbp, used_mouse_me
*** 4243,4250 ****
{
@@ -643,7 +683,7 @@
But `handle-switch-frame is not run from the special-map.
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
+--- src/macim.m 2012-01-13 08:53:57.000000000 +0900
***************
*** 0 ****
--- 1,178 ----
@@ -827,7 +867,7 @@
+ #endif
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
+--- src/nsfns.m 2012-01-13 08:53:57.000000000 +0900
*************** Lisp_Object Fx_open_connection (Lisp_Obj
*** 103,108 ****
--- 103,113 ----
@@ -884,7 +924,7 @@
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
+--- src/nsterm.h 2012-01-13 08:53:57.000000000 +0900
*************** typedef unsigned int NSUInteger;
*** 365,370 ****
--- 365,372 ----
@@ -898,7 +938,7 @@
for managing a table of bitmap "records" */
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-05 17:51:07.000000000 +0900
+--- src/nsterm.m 2012-01-13 08:53:57.000000000 +0900
*************** ns_term_init (Lisp_Object display_name)
*** 3730,3735 ****
--- 3730,3738 ----
@@ -1090,7 +1130,7 @@
pt = [[self window] convertBaseToScreen: pt];
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
+--- src/s/darwin.h 2012-01-13 08:53:57.000000000 +0900
*************** along with GNU Emacs. If not, see <http
*** 163,169 ****
/* Definitions for how to compile & link. */