svnno****@sourc*****
svnno****@sourc*****
2008年 4月 2日 (水) 22:38:06 JST
Revision: 550
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=macemacsjp&view=rev&rev=550
Author: taiichi
Date: 2008-04-02 22:38:06 +0900 (Wed, 02 Apr 2008)
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 2008-03-03 12:57:46 UTC (rev 549)
+++ inline_patch/trunk/ChangeLog 2008-04-02 13:38:06 UTC (rev 550)
@@ -1,3 +1,7 @@
+2008-04-02 HASHIMOTO Taiichi <taiic****@mac*****>
+
+ * Emacs22.2—p‚ÉÄ\’z
+
2007-06-28 HASHIMOTO Taiichi <taiic****@mac*****>
* mac-im.el (mac-translate-from-yen-to-backslash): PowerPC‚Å•ÏX‚³
Modified: inline_patch/trunk/emacs-inline.patch
===================================================================
--- inline_patch/trunk/emacs-inline.patch 2008-03-03 12:57:46 UTC (rev 549)
+++ inline_patch/trunk/emacs-inline.patch 2008-04-02 13:38:06 UTC (rev 550)
@@ -1,9 +1,9 @@
-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
+diff -p -N -r -x '*.orig' ../emacs-22.2/lisp/loadup.el lisp/loadup.el
+*** ../emacs-22.2/lisp/loadup.el 2008-01-10 21:15:32.000000000 +0900
+--- lisp/loadup.el 2008-04-02 22:24:36.000000000 +0900
***************
-*** 207,212 ****
---- 207,215 ----
+*** 209,214 ****
+--- 209,217 ----
(if (fboundp 'atan) ; preload some constants and
(progn ; floating pt. functions if we have float support.
(load "emacs-lisp/float-sup")))
@@ -13,32 +13,36 @@
(message "%s" (garbage-collect))
(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-28 19:49:03.000000000 +0900
+diff -p -N -r -x '*.orig' ../emacs-22.2/lisp/term/mac-im.el lisp/term/mac-im.el
+*** ../emacs-22.2/lisp/term/mac-im.el 1970-01-01 09:00:00.000000000 +0900
+--- lisp/term/mac-im.el 2008-04-02 22:28:36.000000000 +0900
***************
*** 0 ****
---- 1,226 ----
+--- 1,230 ----
+ ;; mac-im.el --- Input Method for Mac OS X -*-coding: iso-2022-7bit;-*-
+
-+ ;; Copyright (C) 2005, 2006, 2007 HASHIMOTO Taiichi <taiic****@mac*****>
++ ;; Copyright (C) 2005, 2006, 2007, 2008
++ ;; HASHIMOTO Taiichi <taiic****@mac*****>
+ ;; Keywords: input method, Mac OS X
+
-+ ;; This file is not part of GNU Emacs.
++ ;; This file is part of GNU Emacs.
+
+ ;; GNU Emacs is free software; you can redistribute it and/or modify
+ ;; it under the terms of the GNU General Public License as published by
-+ ;; the Free Software Foundation; either version 2, or (at your option)
++ ;; the Free Software Foundation; either version 3, or (at your option)
+ ;; any later version.
+
++ ;; GNU Emacs is distributed in the hope that it will be useful,
++ ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
++ ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ ;; GNU General Public License for more details.
++
+ ;; You should have received a copy of the GNU General Public License
+ ;; along with GNU Emacs; see the file COPYING. If not, write to the
-+ ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+ ;; Boston, MA 02111-1307, USA.
++ ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ ;; Boston, MA 02110-1301, USA.
+
-+ ;; Written by Taiichi Hashimoto (taiic****@mac*****).
+
-+
+ ;;
+ ;; Variables and functions to change a input method
+ ;;
@@ -245,11 +249,11 @@
+ (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
+diff -p -N -r -x '*.orig' ../emacs-22.2/lisp/term/mac-win.el lisp/term/mac-win.el
+*** ../emacs-22.2/lisp/term/mac-win.el 2008-03-17 01:27:11.000000000 +0900
+--- lisp/term/mac-win.el 2008-04-02 22:24:36.000000000 +0900
*************** either in the current buffer or in the e
-*** 2086,2094 ****
+*** 2085,2093 ****
(concat msg active-input-string)))
(setq msg active-input-string))
(message "%s" msg)
@@ -259,7 +263,7 @@
(overlay-put mac-ts-active-input-overlay 'before-string
active-input-string))
(mac-unread-string (funcall decode-fun confirmed coding)))
---- 2086,2104 ----
+--- 2085,2103 ----
(concat msg active-input-string)))
(setq msg active-input-string))
(message "%s" msg)
@@ -279,11 +283,11 @@
(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-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
+diff -p -N -r -x '*.orig' ../emacs-22.2/src/Makefile.in src/Makefile.in
+*** ../emacs-22.2/src/Makefile.in 2008-01-10 21:16:14.000000000 +0900
+--- src/Makefile.in 2008-04-02 22:24:36.000000000 +0900
*************** CYGWIN_OBJ = sheap.o
-*** 574,580 ****
+*** 575,581 ****
#ifdef HAVE_CARBON
mac = $(dot)$(dot)/mac/
@@ -291,7 +295,7 @@
emacsapp = $(PWD)/$(mac)Emacs.app/
emacsappsrc = ${srcdir}/../mac/Emacs.app/
#endif
---- 574,580 ----
+--- 575,581 ----
#ifdef HAVE_CARBON
mac = $(dot)$(dot)/mac/
@@ -300,7 +304,7 @@
emacsappsrc = ${srcdir}/../mac/Emacs.app/
#endif
*************** obj= dispnew.o frame.o scroll.o xdisp
-*** 601,607 ****
+*** 602,608 ****
in case they are needed there. */
SOME_MACHINE_OBJECTS = sunfns.o dosfns.o msdos.o \
xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o \
@@ -308,7 +312,7 @@
w32.o w32bdf.o w32console.o w32fns.o w32heap.o w32inevt.o \
w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o
---- 601,607 ----
+--- 602,608 ----
in case they are needed there. */
SOME_MACHINE_OBJECTS = sunfns.o dosfns.o msdos.o \
xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o \
@@ -317,8 +321,8 @@
w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o
*************** macterm.o: blockinput.h atimer.h systime
-*** 1286,1291 ****
---- 1286,1295 ----
+*** 1287,1292 ****
+--- 1287,1296 ----
process.h coding.h $(config_h)
macselect.o: blockinput.h atimer.h systime.h macterm.h macgui.h frame.h \
keymap.h $(config_h)
@@ -329,12 +333,12 @@
${emacsapp}Contents/Resources/English.lproj:
mkdir -p $@
-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
+diff -p -N -r -x '*.orig' ../emacs-22.2/src/keyboard.c src/keyboard.c
+*** ../emacs-22.2/src/keyboard.c 2008-03-02 04:28:20.000000000 +0900
+--- src/keyboard.c 2008-04-02 22:24:36.000000000 +0900
*************** Lisp_Object Qmouse_click;
-*** 531,536 ****
---- 531,539 ----
+*** 532,537 ****
+--- 532,540 ----
#if defined (WINDOWSNT) || defined (MAC_OS)
Lisp_Object Qlanguage_change;
#endif
@@ -345,8 +349,8 @@
Lisp_Object Qsave_session;
#ifdef MAC_OS
*************** kbd_buffer_get_event (kbp, used_mouse_me
-*** 4151,4156 ****
---- 4154,4168 ----
+*** 4163,4168 ****
+--- 4166,4180 ----
kbd_fetch_ptr = event + 1;
}
#endif
@@ -363,8 +367,8 @@
{
obj = Fcons (Qsave_session, Qnil);
*************** syms_of_keyboard ()
-*** 11192,11197 ****
---- 11204,11213 ----
+*** 11214,11219 ****
+--- 11226,11235 ----
Qlanguage_change = intern ("language-change");
staticpro (&Qlanguage_change);
#endif
@@ -375,21 +379,21 @@
Qdrag_n_drop = intern ("drag-n-drop");
staticpro (&Qdrag_n_drop);
-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-26 23:00:50.000000000 +0900
+diff -p -N -r -x '*.orig' ../emacs-22.2/src/macim.c src/macim.c
+*** ../emacs-22.2/src/macim.c 1970-01-01 09:00:00.000000000 +0900
+--- src/macim.c 2008-04-02 22:30:55.000000000 +0900
***************
*** 0 ****
---- 1,267 ----
+--- 1,264 ----
+ /* Implementation of Inline Input Method for MacOS X.
-+ Copyright (C) 2004, 2005, 2006, 2007
++ Copyright (C) 2004, 2005, 2006, 2007, 2008
+ Taiichi Hashimoto <taiic****@mac*****>.
+
-+ This file is not part of GNU Emacs.
++ This file is part of GNU Emacs.
+
+ GNU Emacs is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
-+ the Free Software Foundation; either version 2, or (at your option)
++ the Free Software Foundation; either version 3, or (at your option)
+ any later version.
+
+ GNU Emacs is distributed in the hope that it will be useful,
@@ -399,12 +403,9 @@
+
+ You should have received a copy of the GNU General Public License
+ along with GNU Emacs; see the file COPYING. If not, write to
-+ the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+ Boston, MA 02111-1307, USA. */
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA. */
+
-+ /* Written by Taiichi Hashimoto (taiic****@mac*****). */
-+
-+
+ #include <config.h>
+ #include <signal.h>
+ #include <stdio.h>
@@ -648,11 +649,11 @@
+
+ #endif
+
-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
+diff -p -N -r -x '*.orig' ../emacs-22.2/src/macterm.c src/macterm.c
+*** ../emacs-22.2/src/macterm.c 2008-02-05 00:43:56.000000000 +0900
+--- src/macterm.c 2008-04-02 22:24:36.000000000 +0900
*************** XTread_socket (sd, expected, hold_quit)
-*** 11230,11236 ****
+*** 11282,11288 ****
normally. */
if (!(mapped_modifiers
& ~(mac_pass_command_to_system ? cmdKey : 0)
@@ -660,7 +661,7 @@
{
OSStatus err;
---- 11230,11238 ----
+--- 11282,11290 ----
normally. */
if (!(mapped_modifiers
& ~(mac_pass_command_to_system ? cmdKey : 0)
@@ -671,8 +672,8 @@
OSStatus err;
*************** XTread_socket (sd, expected, hold_quit)
-*** 11465,11470 ****
---- 11467,11473 ----
+*** 11512,11517 ****
+--- 11514,11520 ----
count++;
}
@@ -681,8 +682,8 @@
/* If the focus was just given to an autoraising frame,
*************** init_tsm ()
-*** 11809,11814 ****
---- 11812,11819 ----
+*** 11856,11861 ****
+--- 11859,11866 ----
NewTSMDocument (sizeof (types) / sizeof (types[0]), types,
&tsm_document_id, 0);
@@ -691,9 +692,9 @@
}
#endif
-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
+diff -p -N -r -x '*.orig' ../emacs-22.2/src/termhooks.h src/termhooks.h
+*** ../emacs-22.2/src/termhooks.h 2008-01-10 21:16:15.000000000 +0900
+--- src/termhooks.h 2008-04-02 22:24:36.000000000 +0900
*************** enum event_kind
*** 265,270 ****
--- 265,274 ----