17 files changed, 425 insertions, 133 deletions

diff --git a/src/Makefile b/src/Makefile
index 15d954d54..ea1462a29 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1524,6 +1524,7 @@ PRO_AUTO = \
 	$(TCL_PRO)
 
 ICON_APP = gui_mac.icns
+ICON_DOCTXT = doc-txt.icns
 
 PRO_MANUAL = os_amiga.pro os_msdos.pro os_win16.pro os_win32.pro \
 	os_mswin.pro os_beos.pro os_vms.pro os_riscos.pro $(PERL_PRO)
@@ -2163,7 +2164,7 @@ shadow:	runtime pixmaps
 	cd $(SHADOWDIR)/xxd; ln -s ../../xxd/*.[ch] ../../xxd/Make* .
 	if test -f $(ICON_APP); then \
 		cd $(SHADOWDIR); \
-		ln -s ../$(ICON_APP) ../os_mac.rsr.hqx ../dehqx.py .; \
+		ln -s ../$(ICON_APP) ../$(ICON_DOCTXT) ../os_mac.rsr.hqx ../dehqx.py .; \
 	fi
 	mkdir $(SHADOWDIR)/testdir
 	cd $(SHADOWDIR)/testdir; ln -s ../../testdir/Makefile \
@@ -2528,7 +2529,7 @@ M4FLAGSX = $(M4FLAGS) -DAPP_EXE=$(VIMNAME) -DAPP_NAME=$(VIMNAME) \
 		-DAPP_VER=$(VERSION) -DICON_APP=$(ICON_APP)
 
 ### Icons
-ICONS = $(RESDIR)/$(ICON_APP)
+ICONS = $(RESDIR)/$(ICON_APP) $(RESDIR)/$(ICON_DOCTXT)
 
 # If you uncomment the following lines the *.icns in the src directory will be
 # detected by this Makefile automatically, and used for Vim.
diff --git a/src/auto/configure b/src/auto/configure
index f1178f88e..2eea4afd3 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -3395,6 +3395,8 @@ fi
 		if test x$prefix = xNONE; then
 	  prefix=/Applications
 	fi
+
+		datadir='${prefix}/Vim.app/Contents/Resources'
       fi
     fi
   fi
diff --git a/src/configure.in b/src/configure.in
index 2568fc37f..2a71f42f5 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -165,6 +165,9 @@ if test "`(uname) 2>/dev/null`" = Darwin; then
 	if test x$prefix = xNONE; then
 	  prefix=/Applications
 	fi
+
+	dnl Sorry for the hard coded default
+	datadir='${prefix}/Vim.app/Contents/Resources'
       fi
     fi
   fi
diff --git a/src/doc-txt.icns b/src/doc-txt.icns
new file mode 100644
index 000000000..bcd11d67c
--- /dev/null
+++ b/src/doc-txt.icns
diff --git a/src/edit.c b/src/edit.c
index c22bb39ef..5159a34fc 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -726,8 +726,8 @@ edit(cmdchar, startln, count)
 		    continue;
 		}
 
-		/* Pressing Enter selects the current match. */
-		if (c == CAR || c == K_KENTER || c == NL)
+		/* Pressing CTRL-Y selects the current match. */
+		if (c == Ctrl_Y)
 		{
 		    ins_compl_delete();
 		    ins_compl_insert();
@@ -3274,11 +3274,23 @@ ins_compl_prep(c)
 
 	    auto_format(FALSE, TRUE);
 
-	    /* if the popup menu is displayed hitting Enter means accepting
+	    /* If the popup menu is displayed pressing CTRL-Y means accepting
 	     * the selection without inserting anything. */
-	    if ((c == CAR || c == K_KENTER || c == NL) && pum_visible())
+	    if (c == Ctrl_Y && pum_visible())
 		retval = TRUE;
 
+	    /* CTRL-E means completion is Ended, go back to the typed text. */
+	    if (c == Ctrl_E)
+	    {
+		ins_compl_delete();
+		if (compl_leader != NULL)
+		    ins_bytes(compl_leader + curwin->w_cursor.col - compl_col);
+		else if (compl_first_match != NULL)
+		    ins_bytes(compl_first_match->cp_str
+					  + curwin->w_cursor.col - compl_col);
+		retval = TRUE;
+	    }
+
 	    ins_compl_free();
 	    compl_started = FALSE;
 	    compl_matches = 0;
diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index e0c82c3fc..9e8939233 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -3240,6 +3240,7 @@ do_ecmd(fnum, ffname, sfname, eap, newlnum, flags)
 		    buf_copy_options(buf, BCO_ENTER);
 
 		/* close the link to the current buffer */
+		u_sync();
 		close_buffer(curwin, curbuf,
 				      (flags & ECMD_HIDE) ? 0 : DOBUF_UNLOAD);
 
@@ -5185,7 +5186,8 @@ free_old_sub()
  * Return TRUE when it was created.
  */
     int
-prepare_tagpreview()
+prepare_tagpreview(undo_sync)
+    int		undo_sync;	/* sync undo when leaving the window */
 {
     win_T	*wp;
 
@@ -5202,7 +5204,7 @@ prepare_tagpreview()
 	    if (wp->w_p_pvw)
 		break;
 	if (wp != NULL)
-	    win_enter(wp, TRUE);
+	    win_enter(wp, undo_sync);
 	else
 	{
 	    /*
diff --git a/src/gui_mac.c b/src/gui_mac.c
index 0acc3dbce..420f16cdb 100644
--- a/src/gui_mac.c
+++ b/src/gui_mac.c
@@ -1066,6 +1066,11 @@ HandleODocAE(const AppleEvent *theAEvent, AppleEvent *theReply, long refCon)
 	    else
 		alist_add(&global_alist, p, 2);
 	}
+
+	/* Change directory to the location of the first file. */
+	if (GARGCOUNT > 0 && vim_chdirfile(alist_name(&GARGLIST[0])) == OK)
+	    shorten_fnames(TRUE);
+
 	goto finished;
     }
 
diff --git a/src/gui_w48.c b/src/gui_w48.c
index c4ce0bc98..8b4684a40 100644
--- a/src/gui_w48.c
+++ b/src/gui_w48.c
@@ -1121,8 +1121,7 @@ gui_mch_set_text_area_pos(int x, int y, int w, int h)
 	    top = TOOLBAR_BUTTON_HEIGHT + TOOLBAR_BORDER_HEIGHT;
 #endif
 
-	GetWindowRect(s_hwnd, &rect);
-	SetRect(&rect, 0, top, rect.right, TABLINE_HEIGHT);
+	SetRect(&rect, 0, top, w, TABLINE_HEIGHT);
 	TabCtrl_AdjustRect(s_tabhwnd, TRUE, &rect);
 	MoveWindow(s_tabhwnd, 0, top, rect.right, rect.bottom, TRUE);
     }
diff --git a/src/main.c b/src/main.c
index aff8b3fb3..32f91156d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -449,7 +449,24 @@ main
      * message box.  isatty(2) returns TRUE anyway, thus we need to check the
      * name to know we're not started from a terminal. */
     if (gui.starting && (!isatty(2) || strcmp("/dev/console", ttyname(2)) == 0))
+    {
 	params.want_full_screen = FALSE;
+
+	/* Avoid always using "/" as the current directory.  Note that when
+	 * started from Finder the arglist will be filled later in
+	 * HandleODocAE() and "fname" will be NULL. */
+	if (getcwd((char *)NameBuff, MAXPATHL) != NULL
+						&& STRCMP(NameBuff, "/") == 0)
+	{
+	    if (fname != NULL)
+		(void)vim_chdirfile(fname);
+	    else
+	    {
+		expand_env((char_u *)"$HOME", NameBuff, MAXPATHL);
+		vim_chdir(NameBuff);
+	    }
+	}
+    }
 #endif
 
     /*
diff --git a/src/po/ja.po b/src/po/ja.po
index e46f58540..db6bedd4b 100644
--- a/src/po/ja.po
+++ b/src/po/ja.po
@@ -4,13 +4,13 @@
 # Do ":help credits" in Vim to see a list of people who contributed.
 #
 # MURAOKA Taro <koron@tka.att.ne.jp>, 2001-6.
-# Last Change: 05-Feb-2006.
+# Last Change: 28-Mar-2006.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Vim 7.0\n"
-"POT-Creation-Date: 2006-02-04 22:44+0900\n"
-"PO-Revision-Date: 2006-02-05 00:10+0900\n"
+"POT-Creation-Date: 2006-03-28 20:12+0900\n"
+"PO-Revision-Date: 2006-03-28 21:10+0900\n"
 "Last-Translator: MURAOKA Taro <koron@tka.att.ne.jp>\n"
 "Language-Team: MURAOKA Taro <koron@tka.att.ne.jp>\n"
 "MIME-Version: 1.0\n"
@@ -130,7 +130,7 @@ msgstr "[無名]"
 msgid "help"
 msgstr "ヘルプ"
 
-msgid "[help]"
+msgid "[Help]"
 msgstr "[ヘルプ]"
 
 msgid "[Preview]"
@@ -155,8 +155,8 @@ msgstr ""
 msgid "[Location List]"
 msgstr "[場所リスト]"
 
-msgid "[Error List]"
-msgstr "[エラーリスト]"
+msgid "[Quickfix List]"
+msgstr "[Quickfixリスト]"
 
 msgid ""
 "\n"
@@ -489,6 +489,9 @@ msgstr "E724: 表示するには変数の入れ子が深過ぎます"
 msgid "E699: Too many arguments"
 msgstr "E699: が多過ぎます"
 
+msgid "E785: complete() can only be used in Insert mode"
+msgstr "E785: complete() は挿入モードでしか利用できません"
+
 #.
 #. * Yes this is ugly, I don't particularly like it either.  But doing it
 #. * this way has the compelling advantage that translations need not to
@@ -1021,6 +1024,21 @@ msgstr "行 %ld: %s を取込中"
 msgid "finished sourcing %s"
 msgstr "%s の取込を完了"
 
+msgid "modeline"
+msgstr "モード行"
+
+msgid "--cmd argument"
+msgstr "--cmd 引数"
+
+msgid "-c argument"
+msgstr "-c 引数"
+
+msgid "environment variable"
+msgstr "環境変数"
+
+msgid "error handler"
+msgstr "エラーハンドラ"
+
 msgid "W15: Warning: Wrong line separator, ^M may be missing"
 msgstr "W15: 警告: 行区切が不正です. ^M がないのでしょう"
 
@@ -1151,9 +1169,19 @@ msgstr "E185: カラースキーム %s がみつかりません"
 msgid "Greetings, Vim user!"
 msgstr "Vim 使いさん、やあ!"
 
+msgid "E784: Cannot close last tab page"
+msgstr "E784: 最後のタブページを閉じることはできません"
+
+msgid "Already only one tab page"
+msgstr "既にタブページは1つしかありません"
+
 msgid "Edit File in new window"
 msgstr "新しいウィンドウでファイルを編集します"
 
+#, c-format
+msgid "Tab page %d"
+msgstr "タブページ %d"
+
 msgid "No swap file"
 msgstr "スワップファイルがありません"
 
@@ -1908,6 +1936,15 @@ msgstr "全て置換"
 msgid "Vim: Received \"die\" request from session manager\n"
 msgstr "Vim: セッションマネージャから \"die\" 要求を受け取りました\n"
 
+msgid "Close"
+msgstr "閉じる"
+
+msgid "New tab"
+msgstr "新規タブページ"
+
+msgid "Open Tab..."
+msgstr "タブページを開く..."
+
 msgid "Vim: Main window unexpectedly destroyed\n"
 msgstr "Vim: メインウィンドウが不意に破壊されました\n"
 
@@ -1979,6 +2016,12 @@ msgstr "E243: 引数はサポートされません: \"-%s\"; OLE版を使用してください."
 msgid "E672: Unable to open window inside MDI application"
 msgstr "E672: MDIアプリの中ではウィンドウを開けません"
 
+msgid "Close tab"
+msgstr "タブページを閉じる"
+
+msgid "Open tab..."
+msgstr "タブページを開く"
+
 msgid "Find string (use '\\\\' to find  a '\\')"
 msgstr "検索文字列 ('\\' を検索するには '\\\\')"
 
@@ -2055,10 +2098,6 @@ msgstr "名前:"
 msgid "Show size in Points"
 msgstr "サイズをポイントで表示する"
 
-# msgid " BLOCK"
-# msgstr " ブロック"
-# msgid " LINE"
-# msgstr " 行"
 msgid "Encoding:"
 msgstr "エンコード:"
 
@@ -2658,8 +2697,6 @@ msgstr "このVimにはdiff機能がありません(コンパイル時設定)."
 msgid "Attempt to open script file again: \""
 msgstr "スクリプトファイルを再び開いてみます: \""
 
-# msgid "\"\n"
-# msgstr "\"\n"
 msgid "Cannot open for reading: \""
 msgstr "読込用として開けません"
 
@@ -2835,6 +2872,9 @@ msgstr "-U <gvimrc>\t\t.gvimrcの代わりに <gvimrc> を使う"
 msgid "--noplugin\t\tDon't load plugin scripts"
 msgstr "--noplugin\t\tプラグインスクリプトをロードしない"
 
+msgid "-p[N]\t\tOpen N tab pages (default: one for each file)"
+msgstr "-p[N]\t\tN 個タブページを開く(省略値: ファイルにつき1個)"
+
 msgid "-o[N]\t\tOpen N windows (default: one for each file)"
 msgstr "-o[N]\t\tN 個ウィンドウを開く(省略値: ファイルにつき1個)"
 
@@ -2888,6 +2928,9 @@ msgid ""
 "--remote-wait-silent <files>  Same, don't complain if there is no server"
 msgstr "--remote-wait-silent <files>  同上, サーバが無くても警告文を出力しない"
 
+msgid "--remote-tab <files>  As --remote but open tab page for each file"
+msgstr "--remote-tab <files>  --remoteでファイル1つにつき1つのタブページを開く"
+
 msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit"
 msgstr "--remote-send <keys>\tVimサーバに <keys> を送信して終了する"
 
@@ -3011,8 +3054,6 @@ msgstr "--socketid <xid>\t異なるGTK widgetでVimを開く"
 msgid "-P <parent title>\tOpen Vim inside parent application"
 msgstr "-P <親のタイトル>\tVimを親アプリケーションの中で起動する"
 
-# msgid "--help\t\tShow Gnome arguments"
-# msgstr "--help\t\tGNOMEの引数を見せる"
 msgid "No display"
 msgstr "ディスプレイが見つかりません"
 
@@ -4146,6 +4187,9 @@ msgstr "入出力エラー"
 msgid "...(truncated)"
 msgstr "...(省略)"
 
+msgid "Message"
+msgstr "メッセージ"
+
 msgid "'columns' is not 80, cannot execute external commands"
 msgstr "'columns' が80ではないため, 外部コマンドを実行できません"
 
@@ -4517,10 +4561,6 @@ msgstr " 行指向選択"
 msgid " SELECT BLOCK"
 msgstr " 矩形選択"
 
-# msgid " BLOCK"
-# msgstr " ブロック"
-# msgid " LINE"
-# msgstr " 行"
 msgid "recording"
 msgstr "記録中"
 
@@ -4562,6 +4602,10 @@ msgstr "  みつかりません"
 msgid "Scanning included file: %s"
 msgstr "インクルードされたファイルをスキャン中: %s"
 
+#, c-format
+msgid "Searching included file %s"
+msgstr "インクルードされたファイルをスキャン中 %s"
+
 msgid "E387: Match is on current line"
 msgstr "E387: 現在行に該当があります"
 
@@ -4654,8 +4698,8 @@ msgid "FLAG after using flags in %s line %d: %s"
 msgstr "%s 内の %d 行目にフラグの二重使用があります: %s"
 
 #, c-format
-msgid "Wrong COMPOUNDMAX value in %s line %d: %s"
-msgstr "%s の %d 行目の COMPOUNDMAX の値に誤りがあります: %s"
+msgid "Wrong COMPOUNDWORDMAX value in %s line %d: %s"
+msgstr "%s の %d 行目の COMPOUNDWORDMAX の値に誤りがあります: %s"
 
 #, c-format
 msgid "Wrong COMPOUNDMIN value in %s line %d: %s"
@@ -4666,6 +4710,10 @@ msgid "Wrong COMPOUNDSYLMAX value in %s line %d: %s"
 msgstr "%s の %d 行目の COMPOUNDSYLMAX の値に誤りがあります: %s"
 
 #, c-format
+msgid "Wrong CHECKCOMPOUNDPATTERN value in %s line %d: %s"
+msgstr "%s の %d 行目の CHECKCOMPOUNDPATTERN の値に誤りがあります: %s"
+
+#, c-format
 msgid "Different combining flag in continued affix block in %s line %d: %s"
 msgstr ""
 "%s の %d 行目の 連続 affix ブロックのフラグの組合せに違いがあります: %s"
@@ -4676,10 +4724,10 @@ msgstr "%s の %d 行目に 重複した affix を検出しました: %s"
 
 #, c-format
 msgid ""
-"Affix also used for BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND in %s line %d: "
-"%s"
+"Affix also used for BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST in %s "
+"line %d: %s"
 msgstr ""
-"%s の %d 行目の affix は BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND "
+"%s の %d 行目の affix は BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST "
 "に使用してください: %s"
 
 #, c-format
@@ -4691,6 +4739,10 @@ msgid "Broken condition in %s line %d: %s"
 msgstr "%s の %d 行目の 条件は壊れています: %s"
 
 #, c-format
+msgid "Affix flags ignored when PFXPOSTPONE used in %s line %d: %s"
+msgstr "PFXPOSTPONEが指定されたので %s の %d 行目の affix フラグを無視しました: %s"
+
+#, c-format
 msgid "Expected REP(SAL) count in %s line %d"
 msgstr "%s の %d 行目には REP(SAL) の回数が必要です"
 
@@ -4780,7 +4832,7 @@ msgstr "%s の %d 行目の 重複した /encoding= 行を無視しました: %s"
 
 #, c-format
 msgid "/encoding= line after word ignored in %s line %d: %s"
-msgstr "%s ％s の %d 行目の 単語の後の /encoding= 行を無視しました: %s"
+msgstr "%s の %d 行目の 単語の後の /encoding= 行を無視しました: %s"
 
 #, c-format
 msgid "Duplicate /regions= line ignored in %s line %d: %s"
@@ -4859,6 +4911,14 @@ msgstr "実行しました!"
 msgid "E765: 'spellfile' does not have %ld entries"
 msgstr "E765: 'spellfile' には %ld 個のエントリはありません"
 
+#, c-format
+msgid "Word removed from %s"
+msgstr "%s から単語が削除されました"
+
+#, c-format
+msgid "Word added to %s"
+msgstr "%s に単語が追加されました"
+
 msgid "E763: Word characters differ between spell files"
 msgstr "E763: 単語の文字がスペルファイルと異なります"
 
@@ -5223,15 +5283,52 @@ msgstr "Vim: 入力を読込み中のエラーにより終了します...\n"
 msgid "No undo possible; continue anyway"
 msgstr "可能なアンドゥはありません: とりあえず続けます"
 
+msgid "Already at oldest change"
+msgstr "既に一番古い変更です"
+
+msgid "Already at newest change"
+msgstr "既に一番新しい変更です"
+
+#, c-format
+msgid "Undo number %ld not found"
+msgstr "アンドゥ番号 %ld がみつかりません"
+
 msgid "E438: u_undo: line numbers wrong"
 msgstr "E438: u_undo: 行番号が間違っています"
 
-msgid "1 change"
-msgstr "1 箇所変更しました"
+msgid "more line"
+msgstr "行 追加しました"
+
+msgid "行あります"
+msgstr "行 追加しました"
+
+msgid "line less"
+msgstr "行 削除しました"
+
+msgid "fewer lines"
+msgstr "行 削除しました"
+
+msgid "change"
+msgstr "箇所変更しました"
+
+msgid "changes"
+msgstr "箇所変更しました"
 
 #, c-format
-msgid "%ld changes"
-msgstr "%ld 箇所変更しました"
+msgid "%ld %s; %s #%ld  %s"
+msgstr "%ld %s; %s #%ld  %s"
+
+msgid "before"
+msgstr "前方"
+
+msgid "after"
+msgstr "後方"
+
+msgid "Nothing to undo"
+msgstr "アンドゥ対象がありません"
+
+msgid "number changes  time"
+msgstr "番号   変更     時刻"
 
 msgid "E439: undo list corrupt"
 msgstr "E439: アンドゥリストが壊れています"
@@ -5564,6 +5661,33 @@ msgstr "E446: カーソルの下にファイル名がありません"
 msgid "E447: Can't find file \"%s\" in path"
 msgstr "E447: pathには \"%s\" というファイルがありません"
 
+msgid "Edit with &multiple Vims"
+msgstr "複数のVimで編集する (&M)"
+
+msgid "Edit with single &Vim"
+msgstr "1つのVimで編集する (&V)"
+
+msgid "Diff with Vim"
+msgstr "Vimで差分を見る"
+
+msgid "Edit with &Vim"
+msgstr "Vimで編集する (&V)"
+
+msgid "Edit with existing Vim - "
+msgstr "既存のVimで編集する - "
+
+msgid "Edits the selected file(s) with Vim"
+msgstr "選択されたファイルをVimで編集する"
+
+msgid "Error creating process: Check if gvim is in your path!"
+msgstr "起動に失敗しました: gvim へのパスが正しく設定されているか確認してください!"
+
+msgid "gvimext.dll error"
+msgstr "gvimext.dll エラー"
+
+msgid "Path length too long!"
+msgstr "パスが長過ぎます!"
+
 msgid "--No lines in buffer--"
 msgstr "--バッファに行がありません--"
 
diff --git a/src/po/ja.sjis.po b/src/po/ja.sjis.po
index 411fc3f9b..f663ea29f 100644
--- a/src/po/ja.sjis.po
+++ b/src/po/ja.sjis.po
@@ -4,13 +4,13 @@
 # Do ":help credits" in Vim to see a list of people who contributed.
 #
 # MURAOKA Taro <koron@tka.att.ne.jp>, 2001-6.
-# Last Change: 05-Feb-2006.
+# Last Change: 28-Mar-2006.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Vim 7.0\n"
-"POT-Creation-Date: 2006-02-04 22:44+0900\n"
-"PO-Revision-Date: 2006-02-05 00:10+0900\n"
+"POT-Creation-Date: 2006-03-28 20:12+0900\n"
+"PO-Revision-Date: 2006-03-28 21:10+0900\n"
 "Last-Translator: MURAOKA Taro <koron@tka.att.ne.jp>\n"
 "Language-Team: MURAOKA Taro <koron@tka.att.ne.jp>\n"
 "MIME-Version: 1.0\n"
@@ -130,7 +130,7 @@ msgstr "[����]"
 msgid "help"
 msgstr "�w���v"
 
-msgid "[help]"
+msgid "[Help]"
 msgstr "[�w���v]"
 
 msgid "[Preview]"
@@ -155,8 +155,8 @@ msgstr ""
 msgid "[Location List]"
 msgstr "[�������X�g]"
 
-msgid "[Error List]"
-msgstr "[�G���[���X�g]"
+msgid "[Quickfix List]"
+msgstr "[Quickfix���X�g]"
 
 msgid ""
 "\n"
@@ -489,6 +489,9 @@ msgstr "E724: �\\ｦ�������������������q���[��������"
 msgid "E699: Too many arguments"
 msgstr "E699: ������������"
 
+msgid "E785: complete() can only be used in Insert mode"
+msgstr "E785: complete() ���}�����[�h���������p����������"
+
 #.
 #. * Yes this is ugly, I don't particularly like it either.  But doing it
 #. * this way has the compelling advantage that translations need not to
@@ -1021,6 +1024,21 @@ msgstr "�s %ld: %s ��������"
 msgid "finished sourcing %s"
 msgstr "%s ������������"
 
+msgid "modeline"
+msgstr "���[�h�s"
+
+msgid "--cmd argument"
+msgstr "--cmd ����"
+
+msgid "-c argument"
+msgstr "-c ����"
+
+msgid "environment variable"
+msgstr "��������"
+
+msgid "error handler"
+msgstr "�G���[�n���h��"
+
 msgid "W15: Warning: Wrong line separator, ^M may be missing"
 msgstr "W15: �x��: �s�������s������. ^M ����������������"
 
@@ -1151,9 +1169,19 @@ msgstr "E185: �J���[�X�L�[�� %s ����������������"
 msgid "Greetings, Vim user!"
 msgstr "Vim �g�������A����!"
 
+msgid "E784: Cannot close last tab page"
+msgstr "E784: �������^�u�y�[�W������������������������"
+
+msgid "Already only one tab page"
+msgstr "�����^�u�y�[�W��1����������������"
+
 msgid "Edit File in new window"
 msgstr "�V�����E�B���h�E���t�@�C�������W������"
 
+#, c-format
+msgid "Tab page %d"
+msgstr "�^�u�y�[�W %d"
+
 msgid "No swap file"
 msgstr "�X���b�v�t�@�C��������������"
 
@@ -1908,6 +1936,15 @@ msgstr "�S���u��"
 msgid "Vim: Received \"die\" request from session manager\n"
 msgstr "Vim: �Z�b�V�����}�l�[�W������ \"die\" �v������������������\n"
 
+msgid "Close"
+msgstr "������"
+
+msgid "New tab"
+msgstr "�V�K�^�u�y�[�W"
+
+msgid "Open Tab..."
+msgstr "�^�u�y�[�W���J��..."
+
 msgid "Vim: Main window unexpectedly destroyed\n"
 msgstr "Vim: ���C���E�B���h�E���s�����j������������\n"
 
@@ -1979,6 +2016,12 @@ msgstr "E243: �������T�|�[�g����������: \"-%s\"; OLE�����g�p������������."
 msgid "E672: Unable to open window inside MDI application"
 msgstr "E672: MDI�A�v�����������E�B���h�E���J��������"
 
+msgid "Close tab"
+msgstr "�^�u�y�[�W��������"
+
+msgid "Open tab..."
+msgstr "�^�u�y�[�W���J��"
+
 msgid "Find string (use '\\\\' to find  a '\\')"
 msgstr "���������� ('\\' �������������� '\\\\')"
 
@@ -2055,10 +2098,6 @@ msgstr "���O:"
 msgid "Show size in Points"
 msgstr "�T�C�Y���|�C���g���\\ｦ����"
 
-# msgid " BLOCK"
-# msgstr " �u���b�N"
-# msgid " LINE"
-# msgstr " �s"
 msgid "Encoding:"
 msgstr "�G���R�[�h:"
 
@@ -2658,8 +2697,6 @@ msgstr "����Vim����diff�@�\\������������(�R���p�C��������)."
 msgid "Attempt to open script file again: \""
 msgstr "�X�N���v�g�t�@�C���������J����������: \""
 
-# msgid "\"\n"
-# msgstr "\"\n"
 msgid "Cannot open for reading: \""
 msgstr "�����p�������J��������"
 
@@ -2835,6 +2872,9 @@ msgstr "-U <gvimrc>\t\t.gvimrc���������� <gvimrc> ���g��"
 msgid "--noplugin\t\tDon't load plugin scripts"
 msgstr "--noplugin\t\t�v���O�C���X�N���v�g�����[�h������"
 
+msgid "-p[N]\t\tOpen N tab pages (default: one for each file)"
+msgstr "-p[N]\t\tN ���^�u�y�[�W���J��(�����l: �t�@�C��������1��)"
+
 msgid "-o[N]\t\tOpen N windows (default: one for each file)"
 msgstr "-o[N]\t\tN ���E�B���h�E���J��(�����l: �t�@�C��������1��)"
 
@@ -2888,6 +2928,9 @@ msgid ""
 "--remote-wait-silent <files>  Same, don't complain if there is no server"
 msgstr "--remote-wait-silent <files>  ����, �T�[�o�����������x�������o��������"
 
+msgid "--remote-tab <files>  As --remote but open tab page for each file"
+msgstr "--remote-tab <files>  --remote���t�@�C��1��������1�����^�u�y�[�W���J��"
+
 msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit"
 msgstr "--remote-send <keys>\tVim�T�[�o�� <keys> �����M�����I������"
 
@@ -3011,8 +3054,6 @@ msgstr "--socketid <xid>\t������GTK widget��Vim���J��"
 msgid "-P <parent title>\tOpen Vim inside parent application"
 msgstr "-P <�e���^�C�g��>\tVim���e�A�v���P�[�V�����������N������"
 
-# msgid "--help\t\tShow Gnome arguments"
-# msgstr "--help\t\tGNOME��������������"
 msgid "No display"
 msgstr "�f�B�X�v���C����������������"
 
@@ -4146,6 +4187,9 @@ msgstr "���o���G���["
 msgid "...(truncated)"
 msgstr "...(����)"
 
+msgid "Message"
+msgstr "���b�Z�[�W"
+
 msgid "'columns' is not 80, cannot execute external commands"
 msgstr "'columns' ��80������������, �O���R�}���h��ﾀ�s����������"
 
@@ -4517,10 +4561,6 @@ msgstr " �s�w���I��"
 msgid " SELECT BLOCK"
 msgstr " ���`�I��"
 
-# msgid " BLOCK"
-# msgstr " �u���b�N"
-# msgid " LINE"
-# msgstr " �s"
 msgid "recording"
 msgstr "�L�^��"
 
@@ -4562,6 +4602,10 @@ msgstr "  ��������������"
 msgid "Scanning included file: %s"
 msgstr "�C���N���[�h�������t�@�C�����X�L������: %s"
 
+#, c-format
+msgid "Searching included file %s"
+msgstr "�C���N���[�h�������t�@�C�����X�L������ %s"
+
 msgid "E387: Match is on current line"
 msgstr "E387: �����s���Y������������"
 
@@ -4654,8 +4698,8 @@ msgid "FLAG after using flags in %s line %d: %s"
 msgstr "%s ���� %d �s�����t���O�����d�g�p����������: %s"
 
 #, c-format
-msgid "Wrong COMPOUNDMAX value in %s line %d: %s"
-msgstr "%s �� %d �s���� COMPOUNDMAX ���l����������������: %s"
+msgid "Wrong COMPOUNDWORDMAX value in %s line %d: %s"
+msgstr "%s �� %d �s���� COMPOUNDWORDMAX ���l����������������: %s"
 
 #, c-format
 msgid "Wrong COMPOUNDMIN value in %s line %d: %s"
@@ -4666,6 +4710,10 @@ msgid "Wrong COMPOUNDSYLMAX value in %s line %d: %s"
 msgstr "%s �� %d �s���� COMPOUNDSYLMAX ���l����������������: %s"
 
 #, c-format
+msgid "Wrong CHECKCOMPOUNDPATTERN value in %s line %d: %s"
+msgstr "%s �� %d �s���� CHECKCOMPOUNDPATTERN ���l����������������: %s"
+
+#, c-format
 msgid "Different combining flag in continued affix block in %s line %d: %s"
 msgstr ""
 "%s �� %d �s���� �A�� affix �u���b�N���t���O���g��������������������: %s"
@@ -4676,10 +4724,10 @@ msgstr "%s �� %d �s���� �d������ affix �����o��������: %s"
 
 #, c-format
 msgid ""
-"Affix also used for BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND in %s line %d: "
-"%s"
+"Affix also used for BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST in %s "
+"line %d: %s"
 msgstr ""
-"%s �� %d �s���� affix �� BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND "
+"%s �� %d �s���� affix �� BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST "
 "���g�p������������: %s"
 
 #, c-format
@@ -4691,6 +4739,10 @@ msgid "Broken condition in %s line %d: %s"
 msgstr "%s �� %d �s���� ������������������: %s"
 
 #, c-format
+msgid "Affix flags ignored when PFXPOSTPONE used in %s line %d: %s"
+msgstr "PFXPOSTPONE���w������������ %s �� %d �s���� affix �t���O��������������: %s"
+
+#, c-format
 msgid "Expected REP(SAL) count in %s line %d"
 msgstr "%s �� %d �s������ REP(SAL) ���������K�v����"
 
@@ -4780,7 +4832,7 @@ msgstr "%s �� %d �s���� �d������ /encoding= �s��������������: %s"
 
 #, c-format
 msgid "/encoding= line after word ignored in %s line %d: %s"
-msgstr "%s ��s �� %d �s���� �P�������� /encoding= �s��������������: %s"
+msgstr "%s �� %d �s���� �P�������� /encoding= �s��������������: %s"
 
 #, c-format
 msgid "Duplicate /regions= line ignored in %s line %d: %s"
@@ -4859,6 +4911,14 @@ msgstr "ﾀ�s��������!"
 msgid "E765: 'spellfile' does not have %ld entries"
 msgstr "E765: 'spellfile' ���� %ld �����G���g��������������"
 
+#, c-format
+msgid "Word removed from %s"
+msgstr "%s �����P������������������"
+
+#, c-format
+msgid "Word added to %s"
+msgstr "%s ���P������������������"
+
 msgid "E763: Word characters differ between spell files"
 msgstr "E763: �P�����������X�y���t�@�C��������������"
 
@@ -5223,15 +5283,52 @@ msgstr "Vim: �����������������G���[�������I��������...\n"
 msgid "No undo possible; continue anyway"
 msgstr "���\\���A���h�D������������: ������������������"
 
+msgid "Already at oldest change"
+msgstr "���������������X����"
+
+msgid "Already at newest change"
+msgstr "���������V�������X����"
+
+#, c-format
+msgid "Undo number %ld not found"
+msgstr "�A���h�D���� %ld ����������������"
+
 msgid "E438: u_undo: line numbers wrong"
 msgstr "E438: u_undo: �s��������������������"
 
-msgid "1 change"
-msgstr "1 �������X��������"
+msgid "more line"
+msgstr "�s ������������"
+
+msgid "�s��������"
+msgstr "�s ������������"
+
+msgid "line less"
+msgstr "�s ������������"
+
+msgid "fewer lines"
+msgstr "�s ������������"
+
+msgid "change"
+msgstr "�������X��������"
+
+msgid "changes"
+msgstr "�������X��������"
 
 #, c-format
-msgid "%ld changes"
-msgstr "%ld �������X��������"
+msgid "%ld %s; %s #%ld  %s"
+msgstr "%ld %s; %s #%ld  %s"
+
+msgid "before"
+msgstr "�O��"
+
+msgid "after"
+msgstr "����"
+
+msgid "Nothing to undo"
+msgstr "�A���h�D����������������"
+
+msgid "number changes  time"
+msgstr "����   ���X     ����"
 
 msgid "E439: undo list corrupt"
 msgstr "E439: �A���h�D���X�g��������������"
@@ -5564,6 +5661,33 @@ msgstr "E446: �J�[�\\���������t�@�C����������������"
 msgid "E447: Can't find file \"%s\" in path"
 msgstr "E447: path���� \"%s\" �������t�@�C��������������"
 
+msgid "Edit with &multiple Vims"
+msgstr "������Vim�����W���� (&M)"
+
+msgid "Edit with single &Vim"
+msgstr "1����Vim�����W���� (&V)"
+
+msgid "Diff with Vim"
+msgstr "Vim������������"
+
+msgid "Edit with &Vim"
+msgstr "Vim�����W���� (&V)"
+
+msgid "Edit with existing Vim - "
+msgstr "������Vim�����W���� - "
+
+msgid "Edits the selected file(s) with Vim"
+msgstr "�I���������t�@�C����Vim�����W����"
+
+msgid "Error creating process: Check if gvim is in your path!"
+msgstr "�N����ｸ�s��������: gvim �����p�X�������������������������m�F������������!"
+
+msgid "gvimext.dll error"
+msgstr "gvimext.dll �G���["
+
+msgid "Path length too long!"
+msgstr "�p�X������������!"
+
 msgid "--No lines in buffer--"
 msgstr "--�o�b�t�@���s������������--"
 
diff --git a/src/popupmnu.c b/src/popupmnu.c
index 861e74cee..9f1fae4fb 100644
--- a/src/popupmnu.c
+++ b/src/popupmnu.c
@@ -401,8 +401,11 @@ pum_set_selected(n)
 	}
 
 #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
-	/* Show extra info in the preview window if there is something and
-	 * 'completeopt' contains "preview". */
+	/*
+	 * Show extra info in the preview window if there is something and
+	 * 'completeopt' contains "preview".
+	 * NOTE: Be very careful not to sync undo!
+	 */
 	if (pum_array[pum_selected].pum_info != NULL
 					    && vim_strchr(p_cot, 'p') != NULL)
 	{
@@ -411,7 +414,7 @@ pum_set_selected(n)
 
 	    /* Open a preview window.  3 lines by default. */
 	    g_do_tagpreview = 3;
-	    resized = prepare_tagpreview();
+	    resized = prepare_tagpreview(FALSE);
 	    g_do_tagpreview = 0;
 
 	    if (curwin->w_p_pvw)
@@ -496,7 +499,7 @@ pum_set_selected(n)
 			update_screen(0);
 			pum_do_redraw = FALSE;
 
-			if (win_valid(curwin_save))
+			if (!resized && win_valid(curwin_save))
 			    win_enter(curwin_save, TRUE);
 
 			/* May need to update the screen again when there are
diff --git a/src/proto/ex_cmds.pro b/src/proto/ex_cmds.pro
index 84741c434..4382e6530 100644
--- a/src/proto/ex_cmds.pro
+++ b/src/proto/ex_cmds.pro
@@ -1,59 +1,59 @@
 /* ex_cmds.c */
-extern void do_ascii __ARGS((exarg_T *eap));
-extern void ex_align __ARGS((exarg_T *eap));
-extern void ex_sort __ARGS((exarg_T *eap));
-extern void ex_retab __ARGS((exarg_T *eap));
-extern int do_move __ARGS((linenr_T line1, linenr_T line2, linenr_T dest));
-extern void ex_copy __ARGS((linenr_T line1, linenr_T line2, linenr_T n));
-extern void free_prev_shellcmd __ARGS((void));
-extern void do_bang __ARGS((int addr_count, exarg_T *eap, int forceit, int do_in, int do_out));
-extern void do_shell __ARGS((char_u *cmd, int flags));
-extern char_u *make_filter_cmd __ARGS((char_u *cmd, char_u *itmp, char_u *otmp));
-extern void append_redir __ARGS((char_u *buf, char_u *opt, char_u *fname));
-extern int viminfo_error __ARGS((char *errnum, char *message, char_u *line));
-extern int read_viminfo __ARGS((char_u *file, int want_info, int want_marks, int forceit));
-extern void write_viminfo __ARGS((char_u *file, int forceit));
-extern int viminfo_readline __ARGS((vir_T *virp));
-extern char_u *viminfo_readstring __ARGS((vir_T *virp, int off, int convert));
-extern void viminfo_writestring __ARGS((FILE *fd, char_u *p));
-extern void do_fixdel __ARGS((exarg_T *eap));
-extern void print_line_no_prefix __ARGS((linenr_T lnum, int use_number, int list));
-extern void print_line __ARGS((linenr_T lnum, int use_number, int list));
-extern void ex_file __ARGS((exarg_T *eap));
-extern void ex_update __ARGS((exarg_T *eap));
-extern void ex_write __ARGS((exarg_T *eap));
-extern int do_write __ARGS((exarg_T *eap));
-extern void ex_wnext __ARGS((exarg_T *eap));
-extern void do_wqall __ARGS((exarg_T *eap));
-extern int not_writing __ARGS((void));
-extern int getfile __ARGS((int fnum, char_u *ffname, char_u *sfname, int setpm, linenr_T lnum, int forceit));
-extern int do_ecmd __ARGS((int fnum, char_u *ffname, char_u *sfname, exarg_T *eap, linenr_T newlnum, int flags));
-extern void ex_append __ARGS((exarg_T *eap));
-extern void ex_change __ARGS((exarg_T *eap));
-extern void ex_z __ARGS((exarg_T *eap));
-extern int check_restricted __ARGS((void));
-extern int check_secure __ARGS((void));
-extern void do_sub __ARGS((exarg_T *eap));
-extern int do_sub_msg __ARGS((int count_only));
-extern void ex_global __ARGS((exarg_T *eap));
-extern void global_exe __ARGS((char_u *cmd));
-extern int read_viminfo_sub_string __ARGS((vir_T *virp, int force));
-extern void write_viminfo_sub_string __ARGS((FILE *fp));
-extern void free_old_sub __ARGS((void));
-extern int prepare_tagpreview __ARGS((void));
-extern void ex_help __ARGS((exarg_T *eap));
-extern char_u *check_help_lang __ARGS((char_u *arg));
-extern int help_heuristic __ARGS((char_u *matched_string, int offset, int wrong_case));
-extern int find_help_tags __ARGS((char_u *arg, int *num_matches, char_u ***matches, int keep_lang));
-extern void fix_help_buffer __ARGS((void));
-extern void ex_exusage __ARGS((exarg_T *eap));
-extern void ex_viusage __ARGS((exarg_T *eap));
-extern void ex_helptags __ARGS((exarg_T *eap));
-extern void ex_sign __ARGS((exarg_T *eap));
-extern void sign_gui_started __ARGS((void));
-extern int sign_get_attr __ARGS((int typenr, int line));
-extern char_u *sign_get_text __ARGS((int typenr));
-extern void *sign_get_image __ARGS((int typenr));
-extern char_u *sign_typenr2name __ARGS((int typenr));
-extern void ex_drop __ARGS((exarg_T *eap));
+void do_ascii __ARGS((exarg_T *eap));
+void ex_align __ARGS((exarg_T *eap));
+void ex_sort __ARGS((exarg_T *eap));
+void ex_retab __ARGS((exarg_T *eap));
+int do_move __ARGS((linenr_T line1, linenr_T line2, linenr_T dest));
+void ex_copy __ARGS((linenr_T line1, linenr_T line2, linenr_T n));
+void free_prev_shellcmd __ARGS((void));
+void do_bang __ARGS((int addr_count, exarg_T *eap, int forceit, int do_in, int do_out));
+void do_shell __ARGS((char_u *cmd, int flags));
+char_u *make_filter_cmd __ARGS((char_u *cmd, char_u *itmp, char_u *otmp));
+void append_redir __ARGS((char_u *buf, char_u *opt, char_u *fname));
+int viminfo_error __ARGS((char *errnum, char *message, char_u *line));
+int read_viminfo __ARGS((char_u *file, int want_info, int want_marks, int forceit));
+void write_viminfo __ARGS((char_u *file, int forceit));
+int viminfo_readline __ARGS((vir_T *virp));
+char_u *viminfo_readstring __ARGS((vir_T *virp, int off, int convert));
+void viminfo_writestring __ARGS((FILE *fd, char_u *p));
+void do_fixdel __ARGS((exarg_T *eap));
+void print_line_no_prefix __ARGS((linenr_T lnum, int use_number, int list));
+void print_line __ARGS((linenr_T lnum, int use_number, int list));
+void ex_file __ARGS((exarg_T *eap));
+void ex_update __ARGS((exarg_T *eap));
+void ex_write __ARGS((exarg_T *eap));
+int do_write __ARGS((exarg_T *eap));
+void ex_wnext __ARGS((exarg_T *eap));
+void do_wqall __ARGS((exarg_T *eap));
+int not_writing __ARGS((void));
+int getfile __ARGS((int fnum, char_u *ffname, char_u *sfname, int setpm, linenr_T lnum, int forceit));
+int do_ecmd __ARGS((int fnum, char_u *ffname, char_u *sfname, exarg_T *eap, linenr_T newlnum, int flags));
+void ex_append __ARGS((exarg_T *eap));
+void ex_change __ARGS((exarg_T *eap));
+void ex_z __ARGS((exarg_T *eap));
+int check_restricted __ARGS((void));
+int check_secure __ARGS((void));
+void do_sub __ARGS((exarg_T *eap));
+int do_sub_msg __ARGS((int count_only));
+void ex_global __ARGS((exarg_T *eap));
+void global_exe __ARGS((char_u *cmd));
+int read_viminfo_sub_string __ARGS((vir_T *virp, int force));
+void write_viminfo_sub_string __ARGS((FILE *fp));
+void free_old_sub __ARGS((void));
+int prepare_tagpreview __ARGS((int undo_sync));
+void ex_help __ARGS((exarg_T *eap));
+char_u *check_help_lang __ARGS((char_u *arg));
+int help_heuristic __ARGS((char_u *matched_string, int offset, int wrong_case));
+int find_help_tags __ARGS((char_u *arg, int *num_matches, char_u ***matches, int keep_lang));
+void fix_help_buffer __ARGS((void));
+void ex_exusage __ARGS((exarg_T *eap));
+void ex_viusage __ARGS((exarg_T *eap));
+void ex_helptags __ARGS((exarg_T *eap));
+void ex_sign __ARGS((exarg_T *eap));
+void sign_gui_started __ARGS((void));
+int sign_get_attr __ARGS((int typenr, int line));
+char_u *sign_get_text __ARGS((int typenr));
+void *sign_get_image __ARGS((int typenr));
+char_u *sign_typenr2name __ARGS((int typenr));
+void ex_drop __ARGS((exarg_T *eap));
 /* vim: set ft=c : */
diff --git a/src/proto/gui_mac.pro b/src/proto/gui_mac.pro
index c640351b8..c943b083f 100644
--- a/src/proto/gui_mac.pro
+++ b/src/proto/gui_mac.pro
@@ -28,7 +28,7 @@ void gui_mch_exit __ARGS((int));
 void gui_mch_set_winsize __ARGS((int width, int height, int min_width, int min_height, int base_width, int base_height));
 int gui_mch_get_winpos __ARGS((int *x, int *y));
 void gui_mch_set_winpos __ARGS((int x, int y));
-void gui_mch_set_shellsize __ARGS((int width, int height, int min_width, int min_height, int base_width, int base_height));
+void gui_mch_set_shellsize __ARGS((int width, int height, int min_width, int min_height, int base_width, int base_height, int direction));
 void gui_mch_get_screen_dimensions __ARGS((int *screen_w, int *screen_h));
 void gui_mch_set_text_area_pos __ARGS((int x, int y, int w, int h));
 void gui_mch_enable_scrollbar __ARGS((scrollbar_T *sb, int flag));
diff --git a/src/search.c b/src/search.c
index 145f6c85f..41f38a3d1 100644
--- a/src/search.c
+++ b/src/search.c
@@ -4927,7 +4927,7 @@ search_line:
 		    if (g_do_tagpreview != 0)
 		    {
 			curwin_save = curwin;
-			prepare_tagpreview();
+			prepare_tagpreview(TRUE);
 		    }
 #endif
 		    if (action == ACTION_SPLIT)
diff --git a/src/tag.c b/src/tag.c
index 6c8888cee..a9ac537c5 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -3101,7 +3101,7 @@ jumpto_tag(lbuf, forceit, keep_help)
 	     * Make the preview window the current window.
 	     * Open a preview window when needed.
 	     */
-	    prepare_tagpreview();
+	    prepare_tagpreview(TRUE);
 	}
     }
 
diff --git a/src/version.h b/src/version.h
index 3b06de99a..ce5c97171 100644
--- a/src/version.h
+++ b/src/version.h
@@ -35,6 +35,6 @@
  */
 #define VIM_VERSION_NODOT	"vim70c"
 #define VIM_VERSION_SHORT	"7.0c"
-#define VIM_VERSION_MEDIUM	"7.0c01 BETA"
-#define VIM_VERSION_LONG	"VIM - Vi IMproved 7.0c01 BETA (2006 Mar 27)"
-#define VIM_VERSION_LONG_DATE	"VIM - Vi IMproved 7.0c01 BETA (2006 Mar 27, compiled "
+#define VIM_VERSION_MEDIUM	"7.0c02 BETA"
+#define VIM_VERSION_LONG	"VIM - Vi IMproved 7.0c02 BETA (2006 Mar 28)"
+#define VIM_VERSION_LONG_DATE	"VIM - Vi IMproved 7.0c02 BETA (2006 Mar 28, compiled "