Changeset 90242


Ignore:
Timestamp:
Feb 27, 2012, 3:40:43 PM (6 years ago)
Author:
hum@…
Message:

emacs-app: update inline patch; see #33345.

Location:
trunk/dports/aqua/emacs-app
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/aqua/emacs-app/Portfile

    r89440 r90242  
    66name                emacs-app
    77version             23.4
     8revision            1
    89categories          aqua editors
    910maintainers         css hum openmaintainer
     
    7071# inline and font patches are fetched from MacEmacsJP.
    7172#   http://svn.sourceforge.jp/svnroot/macemacsjp/inline_patch/trunk/
    72 #   revision 574.
     73#   revision 579 (2012/01/13).
    7374# patch-macemacsjp-inline.diff <= emacs-inline.patch
    7475# patch-macemacsjp-jpfont.diff <= font.patch
  • trunk/dports/aqua/emacs-app/files/patch-macemacsjp-inline.diff

    r83747 r90242  
    1 diff -r -p -x '*.elc' ../emacs-23.2.94-0/lisp/term/ns-win.el lisp/term/ns-win.el
    2 *** ../emacs-23.2.94-0/lisp/term/ns-win.el      2011-01-27 05:35:09.000000000 +0900
    3 --- lisp/term/ns-win.el 2011-02-28 13:08:01.000000000 +0900
     1diff -r -p -x '*.elc' ../emacs-23.3-0-lion/lisp/term/ns-win.el lisp/term/ns-win.el
     2*** ../emacs-23.3-0-lion/lisp/term/ns-win.el    2011-12-05 16:49:13.000000000 +0900
     3--- lisp/term/ns-win.el 2012-01-13 08:55:10.000000000 +0900
    44*************** The properties returned may include `top
    55*** 317,322 ****
     
    172172*************** the operating system.")
    173173*** 1267,1272 ****
    174 --- 1345,1731 ----
     174--- 1345,1771 ----
    175175  (add-to-list 'window-system-initialization-alist '(ns . ns-initialize-window-system))
    176176 
     
    353353+      (cursor-type))
    354354+     ("com.justsystems.inputmethod.atok22.Japanese.HalfWidthEiji"
     355+      (title . "半英")
     356+      (cursor-color)
     357+      (cursor-type))
     358+     ("com.justsystems.inputmethod.atok23.Roman"
     359+      (title . "A")
     360+      (cursor-color)
     361+      (cursor-type))
     362+     ("com.justsystems.inputmethod.atok23.Japanese"
     363+      (title . "あ")
     364+      (cursor-color)
     365+      (cursor-type))
     366+     ("com.justsystems.inputmethod.atok23.Japanese.Katakana"
     367+      (title . "ア")
     368+      (cursor-color)
     369+      (cursor-type))
     370+     ("com.justsystems.inputmethod.atok23.Japanese.FullWidthRoman"
     371+      (title . "英")
     372+      (cursor-color)
     373+      (cursor-type))
     374+     ("com.justsystems.inputmethod.atok23.Japanese.HalfWidthEiji"
     375+      (title . "半英")
     376+      (cursor-color)
     377+      (cursor-type))
     378+     ("com.justsystems.inputmethod.atok24.Roman"
     379+      (title . "A")
     380+      (cursor-color)
     381+      (cursor-type))
     382+     ("com.justsystems.inputmethod.atok24.Japanese"
     383+      (title . "あ")
     384+      (cursor-color)
     385+      (cursor-type))
     386+     ("com.justsystems.inputmethod.atok24.Japanese.Katakana"
     387+      (title . "ア")
     388+      (cursor-color)
     389+      (cursor-type))
     390+     ("com.justsystems.inputmethod.atok24.Japanese.FullWidthRoman"
     391+      (title . "英")
     392+      (cursor-color)
     393+      (cursor-type))
     394+     ("com.justsystems.inputmethod.atok24.Japanese.HalfWidthEiji"
    355395+      (title . "半英")
    356396+      (cursor-color)
     
    560600 
    561601  ;; arch-tag: eb138a45-4e2e-4d68-b1c9-a39665731644
    562 diff -r -p -N -x '*.o' ../emacs-23.2.94-0/src/Makefile.in src/Makefile.in
    563 *** ../emacs-23.2.94-0/src/Makefile.in  2011-01-09 02:45:14.000000000 +0900
    564 --- src/Makefile.in     2011-02-15 22:24:06.000000000 +0900
     602diff -r -p -N -x '*.o' ../emacs-23.3-0-lion/src/Makefile.in src/Makefile.in
     603*** ../emacs-23.3-0-lion/src/Makefile.in        2011-12-05 16:49:13.000000000 +0900
     604--- src/Makefile.in     2012-01-13 08:53:57.000000000 +0900
    565605*************** ns_appresdir=@ns_appresdir@/
    566606*** 545,551 ****
     
    607647     commands.h syssignal.h systime.h systty.h syswait.h frame.h dispextern.h \
    608648     blockinput.h atimer.h charset.h coding.h ccl.h msdos.h composite.h \
    609 diff -r -p -N -x '*.o' ../emacs-23.2.94-0/src/keyboard.c src/keyboard.c
    610 *** ../emacs-23.2.94-0/src/keyboard.c   2011-01-29 05:22:59.000000000 +0900
    611 --- src/keyboard.c      2011-02-15 22:24:06.000000000 +0900
     649diff -r -p -N -x '*.o' ../emacs-23.3-0-lion/src/keyboard.c src/keyboard.c
     650*** ../emacs-23.3-0-lion/src/keyboard.c 2011-12-05 16:49:13.000000000 +0900
     651--- src/keyboard.c      2012-01-13 08:53:57.000000000 +0900
    612652*************** kbd_buffer_get_event (kbp, used_mouse_me
    613653*** 4243,4250 ****
     
    642682       current-prefix-arg, as is done in `handle-switch-frame'.
    643683       But `handle-switch-frame is not run from the special-map.
    644 diff -r -p -N -x '*.o' ../emacs-23.2.94-0/src/macim.m src/macim.m
    645 *** ../emacs-23.2.94-0/src/macim.m      1970-01-01 09:00:00.000000000 +0900
    646 --- src/macim.m 2011-02-28 10:27:05.000000000 +0900
     684diff -r -p -N -x '*.o' ../emacs-23.3-0-lion/src/macim.m src/macim.m
     685*** ../emacs-23.3-0-lion/src/macim.m    1970-01-01 09:00:00.000000000 +0900
     686--- src/macim.m 2012-01-13 08:53:57.000000000 +0900
    647687***************
    648688*** 0 ****
     
    826866+ }
    827867+ #endif
    828 diff -r -p -N -x '*.o' ../emacs-23.2.94-0/src/nsfns.m src/nsfns.m
    829 *** ../emacs-23.2.94-0/src/nsfns.m      2011-01-09 02:45:14.000000000 +0900
    830 --- src/nsfns.m 2011-02-15 22:24:06.000000000 +0900
     868diff -r -p -N -x '*.o' ../emacs-23.3-0-lion/src/nsfns.m src/nsfns.m
     869*** ../emacs-23.3-0-lion/src/nsfns.m    2011-12-05 16:49:13.000000000 +0900
     870--- src/nsfns.m 2012-01-13 08:53:57.000000000 +0900
    831871*************** Lisp_Object Fx_open_connection (Lisp_Obj
    832872*** 103,108 ****
     
    883923    check_window_system_func = check_ns;
    884924 
    885 diff -r -p -N -x '*.o' ../emacs-23.2.94-0/src/nsterm.h src/nsterm.h
    886 *** ../emacs-23.2.94-0/src/nsterm.h     2011-01-09 02:45:14.000000000 +0900
    887 --- src/nsterm.h        2011-02-15 22:24:06.000000000 +0900
     925diff -r -p -N -x '*.o' ../emacs-23.3-0-lion/src/nsterm.h src/nsterm.h
     926*** ../emacs-23.3-0-lion/src/nsterm.h   2011-12-05 16:49:13.000000000 +0900
     927--- src/nsterm.h        2012-01-13 08:53:57.000000000 +0900
    888928*************** typedef unsigned int NSUInteger;
    889929*** 365,370 ****
     
    897937  /* could use list to store these, but rest of emacs has a big infrastructure
    898938     for managing a table of bitmap "records" */
    899 diff -r -p -N -x '*.o' ../emacs-23.2.94-0/src/nsterm.m src/nsterm.m
    900 *** ../emacs-23.2.94-0/src/nsterm.m     2011-02-09 08:46:22.000000000 +0900
    901 --- src/nsterm.m        2011-02-15 22:24:06.000000000 +0900
     939diff -r -p -N -x '*.o' ../emacs-23.3-0-lion/src/nsterm.m src/nsterm.m
     940*** ../emacs-23.3-0-lion/src/nsterm.m   2011-12-05 16:50:06.000000000 +0900
     941--- src/nsterm.m        2012-01-13 08:53:57.000000000 +0900
    902942*************** ns_term_init (Lisp_Object display_name)
    903943*** 3730,3735 ****
     
    10891129    pt = [self convertPoint: pt toView: nil];
    10901130    pt = [[self window] convertBaseToScreen: pt];
    1091 diff -r -p -N -x '*.o' ../emacs-23.2.94-0/src/s/darwin.h src/s/darwin.h
    1092 *** ../emacs-23.2.94-0/src/s/darwin.h   2011-01-09 02:45:14.000000000 +0900
    1093 --- src/s/darwin.h      2011-02-15 22:24:06.000000000 +0900
     1131diff -r -p -N -x '*.o' ../emacs-23.3-0-lion/src/s/darwin.h src/s/darwin.h
     1132*** ../emacs-23.3-0-lion/src/s/darwin.h 2011-12-05 16:49:29.000000000 +0900
     1133--- src/s/darwin.h      2012-01-13 08:53:57.000000000 +0900
    10941134*************** along with GNU Emacs.  If not, see <http
    10951135*** 163,169 ****
Note: See TracChangeset for help on using the changeset viewer.