svnno****@sourc*****
svnno****@sourc*****
2007年 6月 28日 (木) 20:00:13 JST
Revision: 499
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=macemacsjp&view=rev&rev=499
Author: taiichi
Date: 2007-06-28 20:00:13 +0900 (Thu, 28 Jun 2007)
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 2007-06-27 22:31:30 UTC (rev 498)
+++ inline_patch/trunk/ChangeLog 2007-06-28 11:00:13 UTC (rev 499)
@@ -1,3 +1,8 @@
+2007-06-28 HASHIMOTO Taiichi <taiic****@mac*****>
+
+ * mac-im.el (mac-translate-from-yen-to-backslash): PowerPC‚Å•ÏX‚³
+ ‚ê‚È‚¢ƒoƒO‚ðC³D
+
2007-06-23 HASHIMOTO Taiichi <taiic****@mbp15*****>
* mac-im.el (mac-translate-from-yen-to-backslash): ‰~‹L†‚ðƒoƒbƒN
Modified: inline_patch/trunk/emacs-inline.patch
===================================================================
--- inline_patch/trunk/emacs-inline.patch 2007-06-27 22:31:30 UTC (rev 498)
+++ inline_patch/trunk/emacs-inline.patch 2007-06-28 11:00:13 UTC (rev 499)
@@ -15,13 +15,13 @@
(load "vc-hooks")
diff -p -N -r -x '*.orig' ../emacs-22.1/lisp/term/mac-im.el lisp/term/mac-im.el
*** ../emacs-22.1/lisp/term/mac-im.el 1970-01-01 09:00:00.000000000 +0900
---- lisp/term/mac-im.el 2007-06-23 22:06:36.000000000 +0900
+--- lisp/term/mac-im.el 2007-06-28 19:49:03.000000000 +0900
***************
*** 0 ****
---- 1,225 ----
+--- 1,226 ----
+ ;; mac-im.el --- Input Method for Mac OS X -*-coding: iso-2022-7bit;-*-
+
-+ ;; Copyright (C) 2005, 2006 HASHIMOTO Taiichi <taiic****@mac*****>
++ ;; Copyright (C) 2005, 2006, 2007 HASHIMOTO Taiichi <taiic****@mac*****>
+ ;; Keywords: input method, Mac OS X
+
+ ;; This file is not part of GNU Emacs.
@@ -171,17 +171,16 @@
+ ;; Minor mode of using input methods on MacOS X
+ ;;
+ (define-minor-mode mac-input-method-mode
-+ "Use input methods on MacOSX."
-+ :init-value t
-+ :group 'mac
-+ :global t
++ "Use input methods on MacOSX."
++ :init-value nil
++ :group 'mac
++ :global t
+
-+ (if mac-input-method-mode
-+ (progn
-+ (setq default-input-method "MacOSX")
-+ (add-hook 'minibuffer-setup-hook 'mac-change-language-to-us))
-+ (setq default-input-method nil)
-+ (remove-hook 'minibuffer-setup-hook 'mac-change-language-to-us)))
++ (if mac-input-method-mode
++ (progn
++ (setq default-input-method "MacOSX")
++ (add-hook 'minibuffer-setup-hook 'mac-change-language-to-us))
++ (setq default-input-method nil)))
+
+ ;;
+ ;; Valiable and functions to ignore system shortcut.
@@ -229,17 +228,19 @@
+ [mac-change-input-method] 'mac-handle-input-method-change)
+
+ ;;
-+ ;; translate yen key to backslash key for JIS keyboard.
++ ;; Convert yen to backslash for JIS keyboard.
+ ;;
+ (defun mac-translate-from-yen-to-backslash ()
+ ;; Convert yen to backslash for JIS keyboard.
+ (interactive)
+
+ (define-key global-map [2213] nil)
++ (define-key global-map [3420] nil)
+ (define-key global-map [67111077] nil)
+ (define-key global-map [134219941] nil)
+ (define-key global-map [201328805] nil)
-+ (define-key function-key-map [2213] [?\\])
++ (define-key function-key-map [2213] [?\\]) ;; for Intel
++ (define-key function-key-map [3420] [?\\]) ;; for PowerPC
+ (define-key function-key-map [67111077] [?\C-\\])
+ (define-key function-key-map [134219941] [?\M-\\])
+ (define-key function-key-map [201328805] [?\C-\M-\\])
@@ -376,7 +377,7 @@
diff -p -N -r -x '*.orig' ../emacs-22.1/src/macim.c src/macim.c
*** ../emacs-22.1/src/macim.c 1970-01-01 09:00:00.000000000 +0900
---- src/macim.c 2007-06-19 21:39:17.000000000 +0900
+--- src/macim.c 2007-06-26 23:00:50.000000000 +0900
***************
*** 0 ****
--- 1,267 ----