vim-app fix transp and vimrc,gvimrc

diff --git a/editors/vim-app/files/kaoriya b/editors/vim-app/files/kaoriya
index 4ca3a65..196866d 100644 (file)
--- a/editors/vim-app/files/kaoriya
+++ b/editors/vim-app/files/kaoriya
@@ -30,7 +30,7 @@ variant aqua conflicts cocoa {
     post-patch {
         # http://iplab.naist.jp/member/mio-su/dist/vim/inline0.2.diff
         # http://wiki.macvim.org/wiki/VimPatches/Transparency
-        foreach file {configure.in gui_mac.c option.c syntax.c vim.h mbyte.c} {
+        foreach file {configure.in gui_mac.c gvimrc mbyte.c option.c syntax.c vim.h} {
             system "cat ${portpath}/${filesdir}/patch-${file}| patch -p0"
         }
     }
@@ -41,7 +41,7 @@ variant cocoa conflicts aqua {
     post-patch {
         system "gnutar xvfj ${filespath}/vim-cocoa-mac-20081128.tbz2 -C ${worksrcpath}/src/"
         system "cat ${portpath}/${filesdir}/patch-vim-cocoa-20081128 | patch -p1"
-        foreach file {configure.in Makefile gui_mac.m option.c option-cocoa.c syntax.c vim.h mbyte.c} {
+        foreach file {configure.in Makefile gui_mac.m gvimrc mbyte.c option.c option-cocoa.c syntax.c vim.h vimrc} {
             system "cat ${portpath}/${filesdir}/patch-${file}| patch -p0"
         }
     }

diff --git a/editors/vim-app/files/patch-gvimrc b/editors/vim-app/files/patch-gvimrc
new file mode 100644 (file)
index 0000000..40afa89
--- /dev/null
+++ b/editors/vim-app/files/patch-gvimrc
@@ -0,0 +1,11 @@
+--- vim72-kaoriya-w32j/gvimrc.orig
++++ vim72-kaoriya-w32j/gvimrc
+@@ -99,7 +99,7 @@
+ "---------------------------------------------------------------------------
+ " 日本語入力に関する設定:
+ "
+-if has('multi_byte_ime') || has('xim')
++if has('multi_byte_ime') || has('xim') || has('mac')
+   " IME ON時のカーソルの色を設定(設定例:紫)
+   highlight CursorIM guibg=Purple guifg=NONE
+   " 挿入モード・検索モードでのデフォルトのIME状態設定

diff --git a/editors/vim-app/files/patch-option-cocoa.c b/editors/vim-app/files/patch-option-cocoa.c
index 6828178..30a27ac 100644 (file)
--- a/editors/vim-app/files/patch-option-cocoa.c
+++ b/editors/vim-app/files/patch-option-cocoa.c
@@ -1,6 +1,13 @@
 --- src/option.c.orig
 +++ src/option.c
-@@ -2563,7 +2563,7 @@
+@@ -2557,13 +2557,13 @@
+                           (char_u *)&p_tbis, PV_NONE,
+                           {(char_u *)"small", (char_u *)0L}},
+ #endif
+-    {"transparency",   "transp",  P_NUM|P_VIM|P_RCLR,
++    {"transparency",   "transp",  P_NUM|P_VI_DEF,
+ #if defined(FEAT_GUI_COCOA)
+                             (char_u *)&p_transp, PV_NONE,
  #else
                              (char_u *)NULL, PV_NONE,
  #endif

diff --git a/editors/vim-app/files/patch-vimrc b/editors/vim-app/files/patch-vimrc
new file mode 100644 (file)
index 0000000..ca945cc
--- /dev/null
+++ b/editors/vim-app/files/patch-vimrc
@@ -0,0 +1,10 @@
+--- vim72-kaoriya-w32j/vimrc.orig
++++ vim72-kaoriya-w32j/vimrc
+@@ -74,6 +74,7 @@
+ endif
+ " MacOS Xメニューの日本語化 (メニュー表示前に行なう必要がある)
+ if has('mac')
++  set enc=utf-8
+   set langmenu=japanese
+ endif
+ " 日本語入力用のkeymapの設定例 (コメントアウト)