svnno****@sourc*****
svnno****@sourc*****
2010年 3月 6日 (土) 22:27:43 JST
Revision: 565
http://sourceforge.jp/projects/macemacsjp/svn/view?view=rev&revision=565
Author: taiichi
Date: 2010-03-06 22:27:43 +0900 (Sat, 06 Mar 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-03-04 06:07:39 UTC (rev 564)
+++ inline_patch/trunk/ChangeLog 2010-03-06 13:27:43 UTC (rev 565)
@@ -1,3 +1,8 @@
+2010-03-06 HASHIMOTO Taiichi <taiic****@mac*****>
+
+ * src/macim.m : IM‚𖳎‹‚·‚邽‚ß‚Ì•Ï”(mac-use-input-method-on-system)‚ð’ljÁD
+ * src/nsterm.m (KeyDown): IM‚𖳎‹‚·‚鈗‚ð’ljÁD
+
2010-03-04 HASHIMOTO Taiichi <taiic****@mac*****>
* src/nsterm.m (KeyDown): system ‚É“n‚·ƒL[(ƒVƒ‡[ƒgƒJƒbƒg)‚ðÝ’è‰Â”\‚É‚·‚éDƒfƒtƒHƒ‹ƒg‚Å‚ÍCCüƒL[(shift‚ðŠÜ‚Þ)‚ª‚‚ꇂÍEmacs—DæD‚»‚ê‚𖳎‹‚·‚é‚悤‚ÉÝ’è‰Â”\‚É‚·‚éD
Modified: inline_patch/trunk/emacs-inline.patch
===================================================================
--- inline_patch/trunk/emacs-inline.patch 2010-03-04 06:07:39 UTC (rev 564)
+++ inline_patch/trunk/emacs-inline.patch 2010-03-06 13:27:43 UTC (rev 565)
@@ -1,6 +1,6 @@
diff -p -N -r -x '*.elc' ../emacs-23.1.93/lisp/term/ns-win.el lisp/term/ns-win.el
*** ../emacs-23.1.93/lisp/term/ns-win.el 2010-01-14 03:32:16.000000000 +0900
---- lisp/term/ns-win.el 2010-03-03 10:46:35.000000000 +0900
+--- lisp/term/ns-win.el 2010-03-06 21:56:55.000000000 +0900
*************** The properties returned may include `top
*** 315,320 ****
--- 315,321 ----
@@ -82,7 +82,7 @@
(cond
((and (overlayp ns-working-overlay)
;; Still alive?
---- 613,683 ----
+--- 613,684 ----
(defun ns-echo-working-text ()
"Echo contents of `ns-working-text' in message display area.
See `ns-insert-working-text'."
@@ -123,7 +123,8 @@
+ (overlay-put (setq ns-marked-overlay
+ (make-overlay (+ start pos) (+ start pos len)
+ (current-buffer) nil t))
-+ 'face 'ns-marked-text-face)))
++ 'face 'ns-marked-text-face)
++ (goto-char (+ start pos))))
+
+ (defun ns-echo-marked-text (pos len)
+ "Echo contents of `ns-working-text' in message display area.
@@ -156,7 +157,7 @@
;; Still alive?
*************** the operating system.")
*** 1263,1268 ****
---- 1326,1711 ----
+--- 1327,1713 ----
(add-to-list 'window-system-initialization-alist '(ns . ns-initialize-window-system))
@@ -460,13 +461,14 @@
+ (progn
+ (setq default-input-method "MacOSX")
+ (add-hook 'minibuffer-setup-hook 'mac-change-language-to-us)
-+ (mac-translate-from-yen-to-backslash))
++ (mac-translate-from-yen-to-backslash)
++ (mac-add-key-passed-to-system 'shift))
+ (setq default-input-method nil)))
+
+ ;;
+ ;; Valiable and functions to pass key(shortcut) to system.
+ ;;
-+ (defvar mac-keys-passed-to-system '(shift)
++ (defvar mac-keys-passed-to-system nil
+ "A list of keys passed to system on MacOSX.")
+
+ (defun mac-add-key-passed-to-system (key)
@@ -545,7 +547,7 @@
;; arch-tag: eb138a45-4e2e-4d68-b1c9-a39665731644
diff -p -N -r -x '*.orig' ../emacs-23.1.93/src/Makefile.in src/Makefile.in
*** ../emacs-23.1.93/src/Makefile.in 2010-01-17 02:35:57.000000000 +0900
---- src/Makefile.in 2010-03-01 14:19:34.000000000 +0900
+--- src/Makefile.in 2010-03-04 14:43:51.000000000 +0900
*************** ns_appresdir=@ns_appresdir@/
*** 542,548 ****
ns_appsrc=@ns_appsrc@
@@ -592,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.93/src/keyboard.c src/keyboard.c
*** ../emacs-23.1.93/src/keyboard.c 2010-02-27 09:03:16.000000000 +0900
---- src/keyboard.c 2010-03-01 17:31:40.000000000 +0900
+--- src/keyboard.c 2010-03-04 14:43:51.000000000 +0900
*************** kbd_buffer_get_event (kbp, used_mouse_me
*** 4195,4202 ****
{
@@ -627,7 +629,7 @@
But `handle-switch-frame is not run from the special-map.
diff -p -N -r -x '*.orig' ../emacs-23.1.93/src/macim.m src/macim.m
*** ../emacs-23.1.93/src/macim.m 1970-01-01 09:00:00.000000000 +0900
---- src/macim.m 2010-03-03 11:20:28.000000000 +0900
+--- src/macim.m 2010-03-04 14:43:51.000000000 +0900
***************
*** 0 ****
--- 1,176 ----
@@ -809,7 +811,7 @@
+ #endif
diff -p -N -r -x '*.orig' ../emacs-23.1.93/src/nsfns.m src/nsfns.m
*** ../emacs-23.1.93/src/nsfns.m 2010-01-15 10:44:40.000000000 +0900
---- src/nsfns.m 2010-03-02 18:06:20.000000000 +0900
+--- src/nsfns.m 2010-03-04 14:43:51.000000000 +0900
*************** Lisp_Object Fx_open_connection (Lisp_Obj
*** 102,107 ****
--- 102,112 ----
@@ -866,7 +868,7 @@
diff -p -N -r -x '*.orig' ../emacs-23.1.93/src/nsterm.h src/nsterm.h
*** ../emacs-23.1.93/src/nsterm.h 2010-01-14 03:32:19.000000000 +0900
---- src/nsterm.h 2010-03-01 17:50:02.000000000 +0900
+--- src/nsterm.h 2010-03-04 14:43:51.000000000 +0900
*************** typedef unsigned int NSUInteger;
*** 365,370 ****
--- 365,372 ----
@@ -880,7 +882,7 @@
for managing a table of bitmap "records" */
diff -p -N -r -x '*.orig' ../emacs-23.1.93/src/nsterm.m src/nsterm.m
*** ../emacs-23.1.93/src/nsterm.m 2010-02-18 16:18:29.000000000 +0900
---- src/nsterm.m 2010-03-04 09:29:01.000000000 +0900
+--- src/nsterm.m 2010-03-04 20:54:46.000000000 +0900
*************** ns_term_init (Lisp_Object display_name)
*** 3705,3710 ****
--- 3705,3713 ----
@@ -1078,7 +1080,7 @@
pt = [[self window] convertBaseToScreen: pt];
diff -p -N -r -x '*.orig' ../emacs-23.1.93/src/s/darwin.h src/s/darwin.h
*** ../emacs-23.1.93/src/s/darwin.h 2010-01-14 03:32:21.000000000 +0900
---- src/s/darwin.h 2010-03-01 14:19:34.000000000 +0900
+--- src/s/darwin.h 2010-03-04 14:43:51.000000000 +0900
*************** along with GNU Emacs. If not, see <http
*** 145,151 ****
/* Definitions for how to compile & link. */