OSDN -- Desarrollar y descargar software de código abierto
Translation Status of Español translation status for es

[macemacsjp-cvs 460] [473]

Back to archive index

svnno****@sourc***** svnno****@sourc*****
2007年 6月 22日 (金) 21:55:33 JST 

Revision: 473
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=macemacsjp&view=rev&rev=473
Author:   taiichi
Date:     2007-06-22 21:55:33 +0900 (Fri, 22 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-02 23:08:24 UTC (rev 472)
+++ inline_patch/trunk/ChangeLog	2007-06-22 12:55:33 UTC (rev 473)
@@ -1,3 +1,8 @@
+2007-06-22  HASHIMOTO Taiichi  <taiic****@mac*****>
+
+	* mac-im.el: ‰~‹L†‚ðƒoƒbƒNƒXƒ‰ƒbƒVƒ…‚ɕύX‚·‚éƒL[ƒoƒCƒ“ƒh‚ð’ljÁ
+	* macim.c: IM‚̏ó‘Ô‚Ì“¯Šú‚ð‚Æ‚é”»’è‚ð•ÏX
+
 2007-03-10  HASHIMOTO Taiichi  <taiic****@mac*****>
 
 	* mac-im.el: isearch-mode ‚Ì‚Æ‚«‚ÉIM‚̏ó‘Ô•\Ž¦‚ªXV‚³‚ê‚È‚¢–â‘è‚ð

Modified: inline_patch/trunk/emacs-inline.patch
===================================================================
--- inline_patch/trunk/emacs-inline.patch	2007-06-02 23:08:24 UTC (rev 472)
+++ inline_patch/trunk/emacs-inline.patch	2007-06-22 12:55:33 UTC (rev 473)
@@ -1,6 +1,6 @@
-diff -p -N -r -x '*.orig' ../emacs-20070409-0/lisp/loadup.el lisp/loadup.el
-*** ../emacs-20070409-0/lisp/loadup.el	2007-04-09 20:40:49.000000000 +0900
---- lisp/loadup.el	2007-04-09 20:41:51.000000000 +0900
+diff -p -N -r -x '*.orig' ../emacs-22.1/lisp/loadup.el lisp/loadup.el
+*** ../emacs-22.1/lisp/loadup.el	2007-01-21 12:53:11.000000000 +0900
+--- lisp/loadup.el	2007-06-09 21:38:40.000000000 +0900
 ***************
 *** 207,212 ****
 --- 207,215 ----
@@ -13,12 +13,12 @@
   (message "%s" (garbage-collect))
   
   (load "vc-hooks")
-diff -p -N -r -x '*.orig' ../emacs-20070409-0/lisp/term/mac-im.el lisp/term/mac-im.el
-*** ../emacs-20070409-0/lisp/term/mac-im.el	1970-01-01 09:00:00.000000000 +0900
---- lisp/term/mac-im.el	2007-04-09 20:41:51.000000000 +0900
+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-22 21:24:08.000000000 +0900
 ***************
 *** 0 ****
---- 1,209 ----
+--- 1,220 ----
 + ;; mac-im.el --- Input Method for Mac OS X -*-coding: iso-2022-7bit;-*-
 + 
 + ;; Copyright (C) 2005, 2006 HASHIMOTO Taiichi <taiic****@mac*****>
@@ -228,9 +228,20 @@
 + (define-key special-event-map
 +   [mac-change-input-method] 'mac-handle-input-method-change)
 +       
-diff -p -N -r -x '*.orig' ../emacs-20070409-0/lisp/term/mac-win.el lisp/term/mac-win.el
-*** ../emacs-20070409-0/lisp/term/mac-win.el	2007-04-09 20:40:41.000000000 +0900
---- lisp/term/mac-win.el	2007-04-09 20:41:51.000000000 +0900
++ ;;
++ ;; Convert yen to backslash when JIS keyboard is used.
++ ;;
++ (define-key global-map [2213] 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 [67111077] [?\C-\\])
++ (define-key function-key-map [134219941] [?\M-\\])
++ (define-key function-key-map [201328805] [?\C-\M-\\])
+diff -p -N -r -x '*.orig' ../emacs-22.1/lisp/term/mac-win.el lisp/term/mac-win.el
+*** ../emacs-22.1/lisp/term/mac-win.el	2007-05-14 23:56:30.000000000 +0900
+--- lisp/term/mac-win.el	2007-06-09 21:38:40.000000000 +0900
 *************** either in the current buffer or in the e
 *** 2086,2094 ****
   				      (concat msg active-input-string)))
@@ -262,9 +273,9 @@
   	(overlay-put mac-ts-active-input-overlay 'before-string
   		     active-input-string))
         (mac-unread-string (funcall decode-fun confirmed coding)))
-diff -p -N -r -x '*.orig' ../emacs-20070409-0/src/Makefile.in src/Makefile.in
-*** ../emacs-20070409-0/src/Makefile.in	2007-04-09 20:40:23.000000000 +0900
---- src/Makefile.in	2007-04-09 20:44:30.000000000 +0900
+diff -p -N -r -x '*.orig' ../emacs-22.1/src/Makefile.in src/Makefile.in
+*** ../emacs-22.1/src/Makefile.in	2007-03-21 23:31:24.000000000 +0900
+--- src/Makefile.in	2007-06-09 21:38:40.000000000 +0900
 *************** CYGWIN_OBJ = sheap.o
 *** 574,580 ****
   
@@ -312,9 +323,9 @@
   
   ${emacsapp}Contents/Resources/English.lproj:
   	mkdir -p $@
-diff -p -N -r -x '*.orig' ../emacs-20070409-0/src/keyboard.c src/keyboard.c
-*** ../emacs-20070409-0/src/keyboard.c	2007-04-09 20:40:23.000000000 +0900
---- src/keyboard.c	2007-04-09 20:41:51.000000000 +0900
+diff -p -N -r -x '*.orig' ../emacs-22.1/src/keyboard.c src/keyboard.c
+*** ../emacs-22.1/src/keyboard.c	2007-04-02 06:54:54.000000000 +0900
+--- src/keyboard.c	2007-06-09 21:38:40.000000000 +0900
 *************** Lisp_Object Qmouse_click;
 *** 531,536 ****
 --- 531,539 ----
@@ -358,12 +369,12 @@
     Qdrag_n_drop = intern ("drag-n-drop");
     staticpro (&Qdrag_n_drop);
   
-diff -p -N -r -x '*.orig' ../emacs-20070409-0/src/macim.c src/macim.c
-*** ../emacs-20070409-0/src/macim.c	1970-01-01 09:00:00.000000000 +0900
---- src/macim.c	2007-04-09 20:41:51.000000000 +0900
+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
 ***************
 *** 0 ****
---- 1,270 ----
+--- 1,267 ----
 + /* Implementation of Inline Input Method for MacOS X.
 +    Copyright (C) 2004, 2005, 2006, 2007
 +     Taiichi Hashimoto <taiic****@mac*****>.
@@ -480,11 +491,9 @@
 + 
 + extern Lisp_Object Qcurrent_input_method;
 + static Lisp_Object Qmac_ignore_shortcut;
-+ static TSMDocumentID tsm_document_id;
-+ int mac_input_method_mode;
 + int mac_pass_key_to_system_on_read_only_buffer;
 + 
-+ void init_input_method (TSMDocumentID id);
++ void init_input_method ();
 + int mac_store_change_input_method_event (unsigned long timestamp);
 + 
 + DEFUN ("mac-set-key-script", Fmac_set_key_script,
@@ -532,20 +541,24 @@
 + int
 + mac_store_change_input_method_event (unsigned long timestamp)
 + {
-+   Lisp_Object input_method;
++   Lisp_Object cim, him, dim;
 +   static SInt16 last_key_script = -1;
 +   SInt16 current_key_script, count = 0;
 + 
 +   BLOCK_INPUT;
 +   current_key_script = GetScriptManagerVariable (smKeyScript);
++   
++   cim = Fsymbol_value (Qcurrent_input_method);
++   him = Fcar_safe (intern ("input-method-history"));
++   dim = Fsymbol_value (intern ("default-input-method"));
 + 
-+   if (mac_input_method_mode)
++   if ((STRINGP (cim) && !strcmp(SDATA (cim), "MacOSX"))
++       || (STRINGP (him) && !strcmp(SDATA (him), "MacOSX"))
++       || (STRINGP (dim) && !strcmp(SDATA (dim), "MacOSX")))
 +     {
-+       input_method = Fsymbol_value (Qcurrent_input_method);
-+ 
 +       if (last_key_script != current_key_script
-+ 	  || (current_key_script && NILP (input_method))
-+ 	  || (!current_key_script && !NILP (input_method)))
++ 	  || (current_key_script && NILP (cim))
++ 	  || (!current_key_script && !NILP (cim)))
 + 	{
 + 	  struct input_event event;
 +       
@@ -611,17 +624,11 @@
 + }
 + 
 + 
-+ void init_input_method (TSMDocumentID id)
++ void init_input_method ()
 + {
-+   tsm_document_id = id;
-+ 
 +   Qmac_ignore_shortcut = intern ("mac-ignore-shortcut");
 +   staticpro (&Qmac_ignore_shortcut);
 + 
-+   DEFVAR_BOOL ("mac-input-method-mode", &mac_input_method_mode,
-+     doc: /* If non-nil, input methods on MacOSX are used. */);
-+   mac_input_method_mode = 1;
-+ 
 +   DEFVAR_BOOL ("mac-pass-key-to-system-on-read-only-buffer",
 + 	       &mac_pass_key_to_system_on_read_only_buffer,
 +     doc: /* If nil, don't pass key to system when buffer is read-only. */);
@@ -630,15 +637,16 @@
 +   defsubr (&Smac_set_key_script);
 +   defsubr (&Smac_get_current_key_script);
 +   defsubr (&Smac_get_last_key_script);
++ 
 + }
 + 
 + #endif
 + 
-diff -p -N -r -x '*.orig' ../emacs-20070409-0/src/macterm.c src/macterm.c
-*** ../emacs-20070409-0/src/macterm.c	2007-04-09 20:40:23.000000000 +0900
---- src/macterm.c	2007-04-09 20:41:51.000000000 +0900
+diff -p -N -r -x '*.orig' ../emacs-22.1/src/macterm.c src/macterm.c
+*** ../emacs-22.1/src/macterm.c	2007-05-25 21:43:34.000000000 +0900
+--- src/macterm.c	2007-06-22 21:31:33.000000000 +0900
 *************** XTread_socket (sd, expected, hold_quit)
-*** 11132,11138 ****
+*** 11230,11236 ****
   	       normally.  */
   	    if (!(mapped_modifiers
   		  & ~(mac_pass_command_to_system ? cmdKey : 0)
@@ -646,7 +654,7 @@
   	      {
   		OSStatus err;
   
---- 11132,11140 ----
+--- 11230,11238 ----
   	       normally.  */
   	    if (!(mapped_modifiers
   		  & ~(mac_pass_command_to_system ? cmdKey : 0)
@@ -657,8 +665,8 @@
   		OSStatus err;
   
 *************** XTread_socket (sd, expected, hold_quit)
-*** 11367,11372 ****
---- 11369,11375 ----
+*** 11465,11470 ****
+--- 11467,11473 ----
   	  count++;
   	}
   
@@ -667,19 +675,19 @@
   
     /* If the focus was just given to an autoraising frame,
 *************** init_tsm ()
-*** 11755,11760 ****
---- 11758,11765 ----
+*** 11809,11814 ****
+--- 11812,11819 ----
   
     NewTSMDocument (sizeof (types) / sizeof (types[0]), types,
   		  &tsm_document_id, 0);
 + 
-+   init_input_method(tsm_document_id);
++   init_input_method();
   }
   #endif
   
-diff -p -N -r -x '*.orig' ../emacs-20070409-0/src/termhooks.h src/termhooks.h
-*** ../emacs-20070409-0/src/termhooks.h	2007-04-09 20:40:24.000000000 +0900
---- src/termhooks.h	2007-04-09 20:41:51.000000000 +0900
+diff -p -N -r -x '*.orig' ../emacs-22.1/src/termhooks.h src/termhooks.h
+*** ../emacs-22.1/src/termhooks.h	2007-01-14 12:24:37.000000000 +0900
+--- src/termhooks.h	2007-06-09 21:38:40.000000000 +0900
 *************** enum event_kind
 *** 265,270 ****
 --- 265,274 ----

macemacsjp-cvs メーリングリストの案内
Back to archive index