Revision: 90242 http://trac.macports.org/changeset/90242 Author: hum@macports.org Date: 2012-02-27 07:40:43 -0800 (Mon, 27 Feb 2012) Log Message: ----------- emacs-app: update inline patch; see #33345. Modified Paths: -------------- trunk/dports/aqua/emacs-app/Portfile trunk/dports/aqua/emacs-app/files/patch-macemacsjp-inline.diff Modified: trunk/dports/aqua/emacs-app/Portfile =================================================================== --- trunk/dports/aqua/emacs-app/Portfile 2012-02-27 15:11:36 UTC (rev 90241) +++ trunk/dports/aqua/emacs-app/Portfile 2012-02-27 15:40:43 UTC (rev 90242) @@ -5,6 +5,7 @@ name emacs-app version 23.4 +revision 1 categories aqua editors maintainers css hum openmaintainer @@ -69,7 +70,7 @@ # inline and font patches are fetched from MacEmacsJP. # http://svn.sourceforge.jp/svnroot/macemacsjp/inline_patch/trunk/ -# revision 574. +# revision 579 (2012/01/13). # patch-macemacsjp-inline.diff <= emacs-inline.patch # patch-macemacsjp-jpfont.diff <= font.patch variant inline description {Add inline patch from MacEmacsJP} { Modified: trunk/dports/aqua/emacs-app/files/patch-macemacsjp-inline.diff =================================================================== --- trunk/dports/aqua/emacs-app/files/patch-macemacsjp-inline.diff 2012-02-27 15:11:36 UTC (rev 90241) +++ trunk/dports/aqua/emacs-app/files/patch-macemacsjp-inline.diff 2012-02-27 15:40:43 UTC (rev 90242) @@ -1,6 +1,6 @@ -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 +diff -r -p -x '*.elc' ../emacs-23.3-0-lion/lisp/term/ns-win.el lisp/term/ns-win.el +*** ../emacs-23.3-0-lion/lisp/term/ns-win.el 2011-12-05 16:49:13.000000000 +0900 +--- lisp/term/ns-win.el 2012-01-13 08:55:10.000000000 +0900 *************** The properties returned may include `top *** 317,322 **** --- 317,323 ---- @@ -171,7 +171,7 @@ ;; Still alive? *************** the operating system.") *** 1267,1272 **** ---- 1345,1731 ---- +--- 1345,1771 ---- (add-to-list 'window-system-initialization-alist '(ns . ns-initialize-window-system)) @@ -355,6 +355,46 @@ + (title . "半英") + (cursor-color) + (cursor-type)) ++ ("com.justsystems.inputmethod.atok23.Roman" ++ (title . "A") ++ (cursor-color) ++ (cursor-type)) ++ ("com.justsystems.inputmethod.atok23.Japanese" ++ (title . "あ") ++ (cursor-color) ++ (cursor-type)) ++ ("com.justsystems.inputmethod.atok23.Japanese.Katakana" ++ (title . "ア") ++ (cursor-color) ++ (cursor-type)) ++ ("com.justsystems.inputmethod.atok23.Japanese.FullWidthRoman" ++ (title . "英") ++ (cursor-color) ++ (cursor-type)) ++ ("com.justsystems.inputmethod.atok23.Japanese.HalfWidthEiji" ++ (title . "半英") ++ (cursor-color) ++ (cursor-type)) ++ ("com.justsystems.inputmethod.atok24.Roman" ++ (title . "A") ++ (cursor-color) ++ (cursor-type)) ++ ("com.justsystems.inputmethod.atok24.Japanese" ++ (title . "あ") ++ (cursor-color) ++ (cursor-type)) ++ ("com.justsystems.inputmethod.atok24.Japanese.Katakana" ++ (title . "ア") ++ (cursor-color) ++ (cursor-type)) ++ ("com.justsystems.inputmethod.atok24.Japanese.FullWidthRoman" ++ (title . "英") ++ (cursor-color) ++ (cursor-type)) ++ ("com.justsystems.inputmethod.atok24.Japanese.HalfWidthEiji" ++ (title . "半英") ++ (cursor-color) ++ (cursor-type)) + ) + "Alist of Mac script code vs parameters for input method on MacOSX.") + @@ -559,9 +599,9 @@ (provide 'ns-win) ;; arch-tag: eb138a45-4e2e-4d68-b1c9-a39665731644 -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 +diff -r -p -N -x '*.o' ../emacs-23.3-0-lion/src/Makefile.in src/Makefile.in +*** ../emacs-23.3-0-lion/src/Makefile.in 2011-12-05 16:49:13.000000000 +0900 +--- src/Makefile.in 2012-01-13 08:53:57.000000000 +0900 *************** ns_appresdir=@ns_appresdir@/ *** 545,551 **** ns_appsrc=@ns_appsrc@ @@ -606,9 +646,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 -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 +diff -r -p -N -x '*.o' ../emacs-23.3-0-lion/src/keyboard.c src/keyboard.c +*** ../emacs-23.3-0-lion/src/keyboard.c 2011-12-05 16:49:13.000000000 +0900 +--- src/keyboard.c 2012-01-13 08:53:57.000000000 +0900 *************** kbd_buffer_get_event (kbp, used_mouse_me *** 4243,4250 **** { @@ -641,9 +681,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 -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 +diff -r -p -N -x '*.o' ../emacs-23.3-0-lion/src/macim.m src/macim.m +*** ../emacs-23.3-0-lion/src/macim.m 1970-01-01 09:00:00.000000000 +0900 +--- src/macim.m 2012-01-13 08:53:57.000000000 +0900 *************** *** 0 **** --- 1,178 ---- @@ -825,9 +865,9 @@ + defsubr (&Smac_toggle_input_source); + } + #endif -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 +diff -r -p -N -x '*.o' ../emacs-23.3-0-lion/src/nsfns.m src/nsfns.m +*** ../emacs-23.3-0-lion/src/nsfns.m 2011-12-05 16:49:13.000000000 +0900 +--- src/nsfns.m 2012-01-13 08:53:57.000000000 +0900 *************** Lisp_Object Fx_open_connection (Lisp_Obj *** 103,108 **** --- 103,113 ---- @@ -882,9 +922,9 @@ /* used only in fontset.c */ check_window_system_func = check_ns; -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 +diff -r -p -N -x '*.o' ../emacs-23.3-0-lion/src/nsterm.h src/nsterm.h +*** ../emacs-23.3-0-lion/src/nsterm.h 2011-12-05 16:49:13.000000000 +0900 +--- src/nsterm.h 2012-01-13 08:53:57.000000000 +0900 *************** typedef unsigned int NSUInteger; *** 365,370 **** --- 365,372 ---- @@ -896,9 +936,9 @@ /* could use list to store these, but rest of emacs has a big infrastructure for managing a table of bitmap "records" */ -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 +diff -r -p -N -x '*.o' ../emacs-23.3-0-lion/src/nsterm.m src/nsterm.m +*** ../emacs-23.3-0-lion/src/nsterm.m 2011-12-05 16:50:06.000000000 +0900 +--- src/nsterm.m 2012-01-13 08:53:57.000000000 +0900 *************** ns_term_init (Lisp_Object display_name) *** 3730,3735 **** --- 3730,3738 ---- @@ -1088,9 +1128,9 @@ pt = [self convertPoint: pt toView: nil]; pt = [[self window] convertBaseToScreen: pt]; -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 +diff -r -p -N -x '*.o' ../emacs-23.3-0-lion/src/s/darwin.h src/s/darwin.h +*** ../emacs-23.3-0-lion/src/s/darwin.h 2011-12-05 16:49:29.000000000 +0900 +--- src/s/darwin.h 2012-01-13 08:53:57.000000000 +0900 *************** along with GNU Emacs. If not, see <http *** 163,169 **** /* Definitions for how to compile & link. */