svnno****@sourc*****
svnno****@sourc*****
2011年 2月 28日 (月) 14:17:41 JST
Revision: 571
http://sourceforge.jp/projects/macemacsjp/svn/view?view=rev&revision=571
Author: taiichi
Date: 2011-02-28 14:17:41 +0900 (Mon, 28 Feb 2011)
Log Message:
-----------
Modified Paths:
--------------
inline_patch/trunk/emacs-inline.patch
-------------- next part --------------
Modified: inline_patch/trunk/emacs-inline.patch
===================================================================
--- inline_patch/trunk/emacs-inline.patch 2011-02-28 05:17:18 UTC (rev 570)
+++ inline_patch/trunk/emacs-inline.patch 2011-02-28 05:17:41 UTC (rev 571)
@@ -1,9 +1,9 @@
-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
+diff -r -p -x '*.elc' ../emacs-23.2.94-0/lisp/term/ns-win.el lisp/term/ns-win.el
+*** ../emacs-23.2.94-0/lisp/term/ns-win.el 2011-01-27 05:35:09.000000000 +0900
+--- lisp/term/ns-win.el 2011-02-28 13:08:01.000000000 +0900
*************** The properties returned may include `top
-*** 315,320 ****
---- 315,321 ----
+*** 317,322 ****
+--- 317,323 ----
(cons (logior (lsh 0 16) 12) 'ns-new-frame)
(cons (logior (lsh 0 16) 13) 'ns-toggle-toolbar)
(cons (logior (lsh 0 16) 14) 'ns-show-prefs)
@@ -12,7 +12,7 @@
(cons (logior (lsh 1 16) 33) 'f2)
(cons (logior (lsh 1 16) 34) 'f3)
*************** The properties returned may include `top
-*** 547,560 ****
+*** 549,562 ****
;; editing window.)
(defface ns-working-text-face
@@ -27,20 +27,27 @@
(defvar ns-working-text) ; nsterm.m
;; Test if in echo area, based on mac-win.el 2007/08/26 unicode-2.
---- 548,570 ----
+--- 550,579 ----
;; editing window.)
(defface ns-working-text-face
-! '((((background dark)) :underline "gray20")
-! (t :underline "gray80"))
+! '((((background dark)) :underline "gray80")
+! (t :underline "gray20"))
"Face used to highlight working text during compose sequence insert."
:group 'ns)
+ (defface ns-marked-text-face
-+ '((t :underline t))
++ '((((background dark)) :underline "gray80")
++ (t :underline "gray20"))
+ "Face used to highlight marked text during compose sequence insert."
+ :group 'ns)
+
++ (defface ns-unmarked-text-face
++ '((((background dark)) :underline "gray20")
++ (t :underline "gray80"))
++ "Face used to highlight marked text during compose sequence insert."
++ :group 'ns)
++
(defvar ns-working-overlay nil
"Overlay used to highlight working text during compose sequence insert.
When text is in th echo area, this just stores the length of the working text.")
@@ -52,8 +59,8 @@
;; Test if in echo area, based on mac-win.el 2007/08/26 unicode-2.
*************** is currently being used."
-*** 581,586 ****
---- 591,597 ----
+*** 583,588 ****
+--- 600,606 ----
(defun ns-put-working-text ()
(interactive)
(if (ns-in-echo-area) (ns-echo-working-text) (ns-insert-working-text)))
@@ -62,11 +69,11 @@
(interactive)
(ns-delete-working-text))
*************** The overlay is assigned the face `ns-wor
-*** 602,620 ****
+*** 604,622 ****
(defun ns-echo-working-text ()
"Echo contents of `ns-working-text' in message display area.
See `ns-insert-working-text'."
- (ns-delete-working-text)
+- (ns-delete-working-text)
(let* ((msg (current-message))
! (msglen (length msg))
! message-log-max)
@@ -82,65 +89,72 @@
(cond
((and (overlayp ns-working-overlay)
;; Still alive?
---- 613,684 ----
+--- 622,700 ----
(defun ns-echo-working-text ()
"Echo contents of `ns-working-text' in message display area.
See `ns-insert-working-text'."
-+ (let* ((msg (current-message))
-+ (msglen (length msg))
-+ message-log-max)
-+ (if (integerp ns-working-overlay)
-+ (progn
-+ (setq msg (substring msg 0 (- (length msg) ns-working-overlay)))
-+ (setq msglen (length msg))))
-+ (setq ns-working-overlay (length ns-working-text))
-+ (setq msg (concat msg ns-working-text))
-+ (put-text-property msglen (+ msglen ns-working-overlay)
-+ 'face 'ns-working-text-face msg)
-+ (message "%s" msg)))
-+
-+ (defun ns-put-marked-text (event)
-+ (interactive "e")
-+
-+ (let ((pos (nth 1 event))
-+ (len (nth 2 event)))
-+ (if (ns-in-echo-area)
-+ (ns-echo-marked-text pos len)
-+ (ns-insert-marked-text pos len))))
-+
-+ (defun ns-insert-marked-text (pos len)
-+ "Insert contents of `ns-working-text' as UTF-8 string and mark with
-+ `ns-working-overlay' and `ns-marked-overlay'. Any previously existing
-+ working text is cleared first. The overlay is assigned the faces
-+ `ns-working-text-face' and `ns-marked-text-face'."
- (ns-delete-working-text)
-+ (let ((start (point)))
-+ (put-text-property pos len 'face 'ns-working-text-face ns-working-text)
-+ (insert ns-working-text)
-+ (overlay-put (setq ns-working-overlay
-+ (make-overlay start (point) (current-buffer) nil t))
-+ 'face 'ns-working-text-face)
-+ (overlay-put (setq ns-marked-overlay
-+ (make-overlay (+ start pos) (+ start pos len)
-+ (current-buffer) nil t))
-+ '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.
-+ See `ns-insert-working-text'."
(let* ((msg (current-message))
! (msglen (length msg))
! message-log-max)
-! (when (integerp ns-working-overlay)
-! (setq msg (substring msg 0 (- (length msg) ns-working-overlay)))
-! (setq msglen (length msg)))
+! (if (integerp ns-working-overlay)
+! (progn
+! (setq msg (substring msg 0 (- (length msg) ns-working-overlay)))
+! (setq msglen (length msg))))
(setq ns-working-overlay (length ns-working-text))
(setq msg (concat msg ns-working-text))
(put-text-property msglen (+ msglen ns-working-overlay)
! 'face 'ns-working-text-face msg)
-! (put-text-property (+ msglen pos) (+ msglen pos len)
-! 'face 'ns-marked-text-face msg)
+! (message "%s" msg)))
+!
+! (defun ns-put-marked-text (event)
+! (interactive "e")
+!
+! (let ((pos (nth 1 event))
+! (len (nth 2 event)))
+! (if (ns-in-echo-area)
+! (ns-echo-marked-text pos len)
+! (ns-insert-marked-text pos len))))
+!
+! (defun ns-insert-marked-text (pos len)
+! "Insert contents of `ns-working-text' as UTF-8 string and mark with
+! `ns-working-overlay' and `ns-marked-overlay'. Any previously existing
+! working text is cleared first. The overlay is assigned the faces
+! `ns-working-text-face' and `ns-marked-text-face'."
+! (ns-delete-working-text)
+! (let ((start (point)))
+! (put-text-property pos len 'face 'ns-working-text-face ns-working-text)
+! (insert ns-working-text)
+! (if (= len 0)
+! (overlay-put (setq ns-working-overlay
+! (make-overlay start (point) (current-buffer) nil t))
+! 'face 'ns-working-text-face)
+! (overlay-put (setq ns-working-overlay
+! (make-overlay start (point) (current-buffer) nil t))
+! 'face 'ns-unmarked-text-face)
+! (overlay-put (setq ns-marked-overlay
+! (make-overlay (+ start pos) (+ start pos len)
+! (current-buffer) nil t))
+! '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.
+! See `ns-insert-working-text'."
+! (let* ((msg (current-message))
+! (msglen (length msg))
+! message-log-max)
+! (when (integerp ns-working-overlay)
+! (setq msg (substring msg 0 (- (length msg) ns-working-overlay)))
+! (setq msglen (length msg)))
+! (setq ns-working-overlay (length ns-working-text))
+! (setq msg (concat msg ns-working-text))
+! (if (> len 0)
+! (put-text-property msglen (+ msglen ns-working-overlay)
+! 'face 'ns-working-text-face msg)
+! (put-text-property msglen (+ msglen ns-working-overlay)
+! 'face 'ns-unmarked-text-face msg)
+! (put-text-property (+ msglen pos) (+ msglen pos len)
+! 'face 'ns-marked-text-face msg))
(message "%s" msg)))
(defun ns-delete-working-text()
@@ -156,8 +170,8 @@
((and (overlayp ns-working-overlay)
;; Still alive?
*************** the operating system.")
-*** 1263,1268 ****
---- 1327,1713 ----
+*** 1267,1272 ****
+--- 1345,1731 ----
(add-to-list 'window-system-initialization-alist '(ns . ns-initialize-window-system))
@@ -545,11 +559,11 @@
(provide 'ns-win)
;; arch-tag: eb138a45-4e2e-4d68-b1c9-a39665731644
-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-06 22:38:39.000000000 +0900
+diff -r -p -N -x '*.o' ../emacs-23.2.94-0/src/Makefile.in src/Makefile.in
+*** ../emacs-23.2.94-0/src/Makefile.in 2011-01-09 02:45:14.000000000 +0900
+--- src/Makefile.in 2011-02-15 22:24:06.000000000 +0900
*************** ns_appresdir=@ns_appresdir@/
-*** 542,548 ****
+*** 545,551 ****
ns_appsrc=@ns_appsrc@
/* Object files for NeXTstep */
NS_OBJ= nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o \
@@ -557,7 +571,7 @@
#endif /* HAVE_NS */
#ifdef HAVE_WINDOW_SYSTEM
---- 542,548 ----
+--- 545,551 ----
ns_appsrc=@ns_appsrc@
/* Object files for NeXTstep */
NS_OBJ= nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o \
@@ -566,7 +580,7 @@
#ifdef HAVE_WINDOW_SYSTEM
*************** obj= dispnew.o frame.o scroll.o xdisp
-*** 580,586 ****
+*** 583,589 ****
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 dbusbind.o \
@@ -574,7 +588,7 @@
w32.o w32console.o w32fns.o w32heap.o w32inevt.o \
w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o $(FONT_DRIVERS)
---- 580,586 ----
+--- 583,589 ----
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 dbusbind.o \
@@ -583,8 +597,8 @@
w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o $(FONT_DRIVERS)
*************** nsterm.o: nsterm.m blockinput.h atimer.h
-*** 1165,1170 ****
---- 1165,1171 ----
+*** 1168,1173 ****
+--- 1168,1174 ----
termopts.h termchar.h disptab.h buffer.h window.h keyboard.h \
$(INTERVALS_H) process.h coding.h lisp.h $(config_h)
nsselect.o: nsselect.m blockinput.h nsterm.h nsgui.h frame.h lisp.h $(config_h)
@@ -592,11 +606,11 @@
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.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-06 22:38:39.000000000 +0900
+diff -r -p -N -x '*.o' ../emacs-23.2.94-0/src/keyboard.c src/keyboard.c
+*** ../emacs-23.2.94-0/src/keyboard.c 2011-01-29 05:22:59.000000000 +0900
+--- src/keyboard.c 2011-02-15 22:24:06.000000000 +0900
*************** kbd_buffer_get_event (kbp, used_mouse_me
-*** 4195,4202 ****
+*** 4243,4250 ****
{
if (event->code == KEY_NS_PUT_WORKING_TEXT)
obj = Fcons (intern ("ns-put-working-text"), Qnil);
@@ -605,7 +619,7 @@
kbd_fetch_ptr = event + 1;
if (used_mouse_menu)
*used_mouse_menu = 1;
---- 4195,4204 ----
+--- 4243,4252 ----
{
if (event->code == KEY_NS_PUT_WORKING_TEXT)
obj = Fcons (intern ("ns-put-working-text"), Qnil);
@@ -617,8 +631,8 @@
if (used_mouse_menu)
*used_mouse_menu = 1;
*************** keys_of_keyboard ()
-*** 12556,12561 ****
---- 12558,12565 ----
+*** 12611,12616 ****
+--- 12613,12620 ----
"ns-put-working-text");
initial_define_lispy_key (Vspecial_event_map, "ns-unput-working-text",
"ns-unput-working-text");
@@ -627,14 +641,14 @@
/* 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.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-12 15:31:22.000000000 +0900
+diff -r -p -N -x '*.o' ../emacs-23.2.94-0/src/macim.m src/macim.m
+*** ../emacs-23.2.94-0/src/macim.m 1970-01-01 09:00:00.000000000 +0900
+--- src/macim.m 2011-02-28 10:27:05.000000000 +0900
***************
*** 0 ****
--- 1,178 ----
+ /* Implementation of Input Method Extension for MacOS X.
-+ Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
++ Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+ Taiichi Hashimoto <taiic****@mac*****>.
+ */
+
@@ -674,7 +688,7 @@
+ static Lisp_Object Vmac_use_input_method_on_system;
+
+ void mac_init_input_method ();
-+ int mac_pass_key_to_system (int code, UInt32 modifiers);
++ int mac_pass_key_to_system (int code, int modifiers);
+ int mac_pass_key_directly_to_emacs ();
+ int mac_store_change_input_method_event ();
+
@@ -759,7 +773,7 @@
+ }
+
+ int
-+ mac_pass_key_to_system (int code, unsigned modifiers)
++ mac_pass_key_to_system (int code, int modifiers)
+ {
+ Lisp_Object keys = Fsymbol_value (Qmac_keys_passed_to_system);
+ Lisp_Object m, k;
@@ -811,9 +825,9 @@
+ defsubr (&Smac_toggle_input_source);
+ }
+ #endif
-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-06 22:38:39.000000000 +0900
+diff -r -p -N -x '*.o' ../emacs-23.2.94-0/src/nsfns.m src/nsfns.m
+*** ../emacs-23.2.94-0/src/nsfns.m 2011-01-09 02:45:14.000000000 +0900
+--- src/nsfns.m 2011-02-15 22:24:06.000000000 +0900
*************** Lisp_Object Fx_open_connection (Lisp_Obj
*** 103,108 ****
--- 103,113 ----
@@ -829,8 +843,8 @@
/* ==========================================================================
*************** be used as the image of the icon represe
-*** 2640,2645 ****
---- 2645,2668 ----
+*** 2632,2637 ****
+--- 2637,2660 ----
doc: /* Toolkit version for NS Windowing. */);
Vns_version_string = ns_appkit_version_str ();
@@ -856,8 +870,8 @@
defsubr (&Sns_get_resource);
defsubr (&Sns_set_resource);
*************** be used as the image of the icon represe
-*** 2684,2689 ****
---- 2707,2716 ----
+*** 2676,2681 ****
+--- 2699,2708 ----
defsubr (&Sx_show_tip);
defsubr (&Sx_hide_tip);
@@ -868,9 +882,29 @@
/* used only in fontset.c */
check_window_system_func = check_ns;
-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-06 22:38:39.000000000 +0900
+diff -r -p -N -x '*.o' ../emacs-23.2.94-0/src/nsfont.m src/nsfont.m
+*** ../emacs-23.2.94-0/src/nsfont.m 2011-01-09 02:45:14.000000000 +0900
+--- src/nsfont.m 2011-02-28 10:25:42.000000000 +0900
+*************** nsfont_open (FRAME_PTR f, Lisp_Object fo
+*** 833,839 ****
+ hd = full_height - min_height;
+
+ /* standard height, similar to Carbon. Emacs.app: was 0.5 by default. */
+! expand = 0.0;
+ hshrink = 1.0;
+
+ font_info->underpos = 2; /*[sfont underlinePosition] is often clipped out */
+--- 833,839 ----
+ hd = full_height - min_height;
+
+ /* standard height, similar to Carbon. Emacs.app: was 0.5 by default. */
+! expand = 0.5;
+ hshrink = 1.0;
+
+ font_info->underpos = 2; /*[sfont underlinePosition] is often clipped out */
+diff -r -p -N -x '*.o' ../emacs-23.2.94-0/src/nsterm.h src/nsterm.h
+*** ../emacs-23.2.94-0/src/nsterm.h 2011-01-09 02:45:14.000000000 +0900
+--- src/nsterm.h 2011-02-15 22:24:06.000000000 +0900
*************** typedef unsigned int NSUInteger;
*** 365,370 ****
--- 365,372 ----
@@ -882,12 +916,12 @@
/* 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.95/src/nsterm.m src/nsterm.m
-*** ../emacs-23.2/src/nsterm.m 2010-04-04 07:26:04.000000000 +0900
---- src/nsterm.m 2010-06-23 05:32:39.000000000 +0900
+diff -r -p -N -x '*.o' ../emacs-23.2.94-0/src/nsterm.m src/nsterm.m
+*** ../emacs-23.2.94-0/src/nsterm.m 2011-02-09 08:46:22.000000000 +0900
+--- src/nsterm.m 2011-02-15 22:24:06.000000000 +0900
*************** ns_term_init (Lisp_Object display_name)
-*** 3705,3710 ****
---- 3705,3713 ----
+*** 3730,3735 ****
+--- 3730,3738 ----
/* [[NSNotificationCenter defaultCenter] addObserver: NSApp
selector: @selector (logNotification:)
name: nil object: nil]; */
@@ -898,8 +932,8 @@
dpyinfo = (struct ns_display_info *)xmalloc (sizeof (struct ns_display_info));
bzero (dpyinfo, sizeof (struct ns_display_info));
*************** ns_term_shutdown (int sig)
-*** 3910,3915 ****
---- 3913,3930 ----
+*** 3935,3940 ****
+--- 3938,3955 ----
NSLog (@"notification: '%@'", [notification name]);
}
@@ -919,7 +953,7 @@
- (void)sendEvent: (NSEvent *)theEvent
/* --------------------------------------------------------------------------
*************** ns_term_shutdown (int sig)
-*** 4457,4479 ****
+*** 4488,4510 ****
code, fnKeysym, flags, emacs_event->modifiers);
/* if it was a function key or had modifiers, pass it directly to emacs */
@@ -943,7 +977,7 @@
}
/* if we get here we should send the key for input manager processing */
---- 4472,4509 ----
+--- 4503,4540 ----
code, fnKeysym, flags, emacs_event->modifiers);
/* if it was a function key or had modifiers, pass it directly to emacs */
@@ -983,7 +1017,7 @@
/* if we get here we should send the key for input manager processing */
*************** ns_term_shutdown (int sig)
-*** 4563,4572 ****
+*** 4594,4603 ****
NSLog (@"setMarkedText '%@' len =%d range %d from %d", str, [str length],
selRange.length, selRange.location);
@@ -994,7 +1028,7 @@
if (!emacs_event)
return;
---- 4593,4611 ----
+--- 4624,4642 ----
NSLog (@"setMarkedText '%@' len =%d range %d from %d", str, [str length],
selRange.length, selRange.location);
@@ -1015,7 +1049,7 @@
if (!emacs_event)
return;
*************** ns_term_shutdown (int sig)
-*** 4576,4582 ****
+*** 4607,4613 ****
ns_working_text = build_string ([workingText UTF8String]);
emacs_event->kind = NS_TEXT_EVENT;
@@ -1023,7 +1057,7 @@
EV_TRAILER ((id)nil);
}
---- 4615,4623 ----
+--- 4646,4654 ----
ns_working_text = build_string ([workingText UTF8String]);
emacs_event->kind = NS_TEXT_EVENT;
@@ -1034,7 +1068,7 @@
}
*************** ns_term_shutdown (int sig)
-*** 4631,4645 ****
+*** 4662,4676 ****
{
NSRect rect;
NSPoint pt;
@@ -1050,7 +1084,7 @@
pt = [self convertPoint: pt toView: nil];
pt = [[self window] convertBaseToScreen: pt];
---- 4672,4694 ----
+--- 4703,4725 ----
{
NSRect rect;
NSPoint pt;
@@ -1074,11 +1108,11 @@
pt = [self convertPoint: pt toView: nil];
pt = [[self window] convertBaseToScreen: pt];
-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-06 22:38:39.000000000 +0900
+diff -r -p -N -x '*.o' ../emacs-23.2.94-0/src/s/darwin.h src/s/darwin.h
+*** ../emacs-23.2.94-0/src/s/darwin.h 2011-01-09 02:45:14.000000000 +0900
+--- src/s/darwin.h 2011-02-15 22:24:06.000000000 +0900
*************** along with GNU Emacs. If not, see <http
-*** 145,151 ****
+*** 163,169 ****
/* Definitions for how to compile & link. */
#ifdef HAVE_NS
@@ -1086,7 +1120,7 @@
#define SYSTEM_PURESIZE_EXTRA 200000
#define HEADERPAD_EXTRA 6C8
#else /* !HAVE_NS */
---- 145,151 ----
+--- 163,169 ----
/* Definitions for how to compile & link. */
#ifdef HAVE_NS