svnno****@sourc*****
svnno****@sourc*****
2010年 4月 7日 (水) 20:14:50 JST
Revision: 566
http://sourceforge.jp/projects/macemacsjp/svn/view?view=rev&revision=566
Author: taiichi
Date: 2010-04-07 20:14:49 +0900 (Wed, 07 Apr 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-06 13:27:43 UTC (rev 565)
+++ inline_patch/trunk/ChangeLog 2010-04-07 11:14:49 UTC (rev 566)
@@ -1,3 +1,7 @@
+2010-04-07 HASHIMOTO Taiichi <taiic****@mac*****>
+
+ * src/Makefile.in: pretest 23.1.95 ‚ɑΉžD
+
2010-03-06 HASHIMOTO Taiichi <taiic****@mac*****>
* src/macim.m : IM‚𖳎‹‚·‚邽‚ß‚Ì•Ï”(mac-use-input-method-on-system)‚ð’ljÁD
Modified: inline_patch/trunk/emacs-inline.patch
===================================================================
--- inline_patch/trunk/emacs-inline.patch 2010-03-06 13:27:43 UTC (rev 565)
+++ inline_patch/trunk/emacs-inline.patch 2010-04-07 11:14:49 UTC (rev 566)
@@ -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-06 21:56:55.000000000 +0900
+diff -p -N -r -x '*.elc' ../emacs-23.1.95/lisp/term/ns-win.el lisp/term/ns-win.el
+*** ../emacs-23.1.95/lisp/term/ns-win.el 2010-03-11 11:20:29.000000000 +0900
+--- lisp/term/ns-win.el 2010-04-03 21:49:10.000000000 +0900
*************** The properties returned may include `top
*** 315,320 ****
--- 315,321 ----
@@ -545,9 +545,9 @@
(provide 'ns-win)
;; 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-04 14:43:51.000000000 +0900
+diff -p -N -r -x '*.orig' ../emacs-23.1.95/src/Makefile.in src/Makefile.in
+*** ../emacs-23.1.95/src/Makefile.in 2010-03-29 04:08:24.000000000 +0900
+--- src/Makefile.in 2010-04-03 21:50:20.000000000 +0900
*************** ns_appresdir=@ns_appresdir@/
*** 542,548 ****
ns_appsrc=@ns_appsrc@
@@ -569,7 +569,7 @@
*** 580,586 ****
SOME_MACHINE_OBJECTS = dosfns.o msdos.o \
xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o \
- fontset.o \
+ fontset.o dbusbind.o \
! nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o \
w32.o w32console.o w32fns.o w32heap.o w32inevt.o \
w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o $(FONT_DRIVERS)
@@ -577,8 +577,8 @@
--- 580,586 ----
SOME_MACHINE_OBJECTS = dosfns.o msdos.o \
xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o \
- fontset.o \
-! nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o macim.o \
+ fontset.o dbusbind.o \
+! nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o macim.o\
w32.o w32console.o w32fns.o w32heap.o w32inevt.o \
w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o $(FONT_DRIVERS)
@@ -592,9 +592,9 @@
process.o: process.c process.h buffer.h window.h termhooks.h termopts.h \
commands.h syssignal.h systime.h systty.h syswait.h frame.h dispextern.h \
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-04 14:43:51.000000000 +0900
+diff -p -N -r -x '*.orig' ../emacs-23.1.95/src/keyboard.c src/keyboard.c
+*** ../emacs-23.1.95/src/keyboard.c 2010-03-11 11:20:27.000000000 +0900
+--- src/keyboard.c 2010-04-03 21:49:10.000000000 +0900
*************** kbd_buffer_get_event (kbp, used_mouse_me
*** 4195,4202 ****
{
@@ -627,9 +627,9 @@
/* Here we used to use `ignore-event' which would simple set prefix-arg to
current-prefix-arg, as is done in `handle-switch-frame'.
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-04 14:43:51.000000000 +0900
+diff -p -N -r -x '*.orig' ../emacs-23.1.95/src/macim.m src/macim.m
+*** ../emacs-23.1.95/src/macim.m 1970-01-01 09:00:00.000000000 +0900
+--- src/macim.m 2010-04-03 21:49:10.000000000 +0900
***************
*** 0 ****
--- 1,176 ----
@@ -809,12 +809,12 @@
+ defsubr (&Smac_toggle_input_source);
+ }
+ #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-04 14:43:51.000000000 +0900
+diff -p -N -r -x '*.orig' ../emacs-23.1.95/src/nsfns.m src/nsfns.m
+*** ../emacs-23.1.95/src/nsfns.m 2010-03-31 23:24:32.000000000 +0900
+--- src/nsfns.m 2010-04-03 21:49:10.000000000 +0900
*************** Lisp_Object Fx_open_connection (Lisp_Obj
-*** 102,107 ****
---- 102,112 ----
+*** 103,108 ****
+--- 103,113 ----
extern BOOL ns_in_resize;
@@ -827,8 +827,8 @@
/* ==========================================================================
*************** be used as the image of the icon represe
-*** 2634,2639 ****
---- 2639,2662 ----
+*** 2640,2645 ****
+--- 2645,2668 ----
doc: /* Toolkit version for NS Windowing. */);
Vns_version_string = ns_appkit_version_str ();
@@ -854,8 +854,8 @@
defsubr (&Sns_get_resource);
defsubr (&Sns_set_resource);
*************** be used as the image of the icon represe
-*** 2678,2683 ****
---- 2701,2710 ----
+*** 2684,2689 ****
+--- 2707,2716 ----
defsubr (&Sx_show_tip);
defsubr (&Sx_hide_tip);
@@ -866,9 +866,9 @@
/* used only in fontset.c */
check_window_system_func = check_ns;
-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-04 14:43:51.000000000 +0900
+diff -p -N -r -x '*.orig' ../emacs-23.1.95/src/nsterm.h src/nsterm.h
+*** ../emacs-23.1.95/src/nsterm.h 2010-03-31 23:24:49.000000000 +0900
+--- src/nsterm.h 2010-04-03 21:49:10.000000000 +0900
*************** typedef unsigned int NSUInteger;
*** 365,370 ****
--- 365,372 ----
@@ -880,9 +880,9 @@
/* could use list to store these, but rest of emacs has a big infrastructure
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 20:54:46.000000000 +0900
+diff -p -N -r -x '*.orig' ../emacs-23.1.95/src/nsterm.m src/nsterm.m
+*** ../emacs-23.1.95/src/nsterm.m 2010-03-30 08:28:49.000000000 +0900
+--- src/nsterm.m 2010-04-03 21:49:10.000000000 +0900
*************** ns_term_init (Lisp_Object display_name)
*** 3705,3710 ****
--- 3705,3713 ----
@@ -916,8 +916,8 @@
- (void)sendEvent: (NSEvent *)theEvent
/* --------------------------------------------------------------------------
-*************** extern void update_window_cursor (struct
-*** 4459,4481 ****
+*************** ns_term_shutdown (int sig)
+*** 4457,4479 ****
code, fnKeysym, flags, emacs_event->modifiers);
/* if it was a function key or had modifiers, pass it directly to emacs */
@@ -941,7 +941,7 @@
}
/* if we get here we should send the key for input manager processing */
---- 4474,4507 ----
+--- 4472,4505 ----
code, fnKeysym, flags, emacs_event->modifiers);
/* if it was a function key or had modifiers, pass it directly to emacs */
@@ -976,8 +976,8 @@
}
/* if we get here we should send the key for input manager processing */
-*************** extern void update_window_cursor (struct
-*** 4494,4500 ****
+*************** ns_term_shutdown (int sig)
+*** 4492,4498 ****
[nsEvArray removeObject: theEvent];
}
@@ -985,9 +985,9 @@
#ifdef NS_IMPL_COCOA
/* Needed to pick up Ctrl-tab and possibly other events that OS X has
decided not to send key-down for.
---- 4520,4525 ----
-*************** extern void update_window_cursor (struct
-*** 4565,4574 ****
+--- 4518,4523 ----
+*************** ns_term_shutdown (int sig)
+*** 4563,4572 ****
NSLog (@"setMarkedText '%@' len =%d range %d from %d", str, [str length],
selRange.length, selRange.location);
@@ -998,7 +998,7 @@
if (!emacs_event)
return;
---- 4590,4608 ----
+--- 4588,4606 ----
NSLog (@"setMarkedText '%@' len =%d range %d from %d", str, [str length],
selRange.length, selRange.location);
@@ -1018,8 +1018,8 @@
if (!emacs_event)
return;
-*************** extern void update_window_cursor (struct
-*** 4578,4584 ****
+*************** ns_term_shutdown (int sig)
+*** 4576,4582 ****
ns_working_text = build_string ([workingText UTF8String]);
emacs_event->kind = NS_TEXT_EVENT;
@@ -1027,7 +1027,7 @@
EV_TRAILER ((id)nil);
}
---- 4612,4620 ----
+--- 4610,4618 ----
ns_working_text = build_string ([workingText UTF8String]);
emacs_event->kind = NS_TEXT_EVENT;
@@ -1037,8 +1037,8 @@
EV_TRAILER ((id)nil);
}
-*************** extern void update_window_cursor (struct
-*** 4633,4647 ****
+*************** ns_term_shutdown (int sig)
+*** 4631,4645 ****
{
NSRect rect;
NSPoint pt;
@@ -1054,7 +1054,7 @@
pt = [self convertPoint: pt toView: nil];
pt = [[self window] convertBaseToScreen: pt];
---- 4669,4691 ----
+--- 4667,4689 ----
{
NSRect rect;
NSPoint pt;
@@ -1078,9 +1078,9 @@
pt = [self convertPoint: pt toView: nil];
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-04 14:43:51.000000000 +0900
+diff -p -N -r -x '*.orig' ../emacs-23.1.95/src/s/darwin.h src/s/darwin.h
+*** ../emacs-23.1.95/src/s/darwin.h 2010-03-11 11:20:25.000000000 +0900
+--- src/s/darwin.h 2010-04-03 21:49:10.000000000 +0900
*************** along with GNU Emacs. If not, see <http
*** 145,151 ****
/* Definitions for how to compile & link. */