From 19a09a189379659b917cf5ccff78f3e5ec061015 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 4 Mar 2005 23:39:37 +0000
Subject: updated for version 7.0055

---
 src/VisVim/Res/ToolbarL.bmp |  Bin 0 -> 2678 bytes
 src/VisVim/Res/ToolbarM.bmp |  Bin 0 -> 758 bytes
 src/eval.c                  |   47 +-
 src/fileio.c                |   60 +-
 src/getchar.c               |    4 +
 src/gui_gtk_x11.c           |   89 +-
 src/gui_w32.c               |   22 +-
 src/gui_x11.c               |    2 +
 src/keymap.h                |   15 +-
 src/misc2.c                 |    1 +
 src/normal.c                |    3 +-
 src/option.c                |    4 +-
 src/os_mac_conv.c           |    8 +-
 src/os_mswin.c              |    7 +-
 src/po/ja.po                | 3778 ++++++++++++++++++++++++-------------------
 src/po/ja.sjis.po           | 3778 ++++++++++++++++++++++++-------------------
 src/proto/eval.pro          |    1 +
 src/proto/tag.pro           |    1 +
 src/regexp.c                |   28 +-
 src/tag.c                   |  125 ++
 src/term.c                  |  198 ++-
 src/testdir/test24.in       |  Bin 890 -> 975 bytes
 src/testdir/test24.ok       |    3 +
 src/undo.c                  |    4 +
 src/version.h               |    4 +-
 src/vim.h                   |    4 +-
 26 files changed, 4768 insertions(+), 3418 deletions(-)
 create mode 100644 src/VisVim/Res/ToolbarL.bmp
 create mode 100644 src/VisVim/Res/ToolbarM.bmp

(limited to 'src')

diff --git a/src/VisVim/Res/ToolbarL.bmp b/src/VisVim/Res/ToolbarL.bmp
new file mode 100644
index 0000000000..e11c66fc65
Binary files /dev/null and b/src/VisVim/Res/ToolbarL.bmp differ
diff --git a/src/VisVim/Res/ToolbarM.bmp b/src/VisVim/Res/ToolbarM.bmp
new file mode 100644
index 0000000000..22e15f4893
Binary files /dev/null and b/src/VisVim/Res/ToolbarM.bmp differ
diff --git a/src/eval.c b/src/eval.c
index bde12e56e1..c7aba51456 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -316,6 +316,8 @@ static struct vimvar
     {VV_NAME("val",		 VAR_UNKNOWN), VV_RO},
     {VV_NAME("key",		 VAR_UNKNOWN), VV_RO},
     {VV_NAME("profiling",	 VAR_NUMBER), VV_RO},
+    {VV_NAME("fcs_reason",	 VAR_STRING), VV_RO},
+    {VV_NAME("fcs_choice",	 VAR_STRING), 0},
 };
 
 /* shorthand */
@@ -549,6 +551,7 @@ static void f_synID __ARGS((typval_T *argvars, typval_T *rettv));
 static void f_synIDattr __ARGS((typval_T *argvars, typval_T *rettv));
 static void f_synIDtrans __ARGS((typval_T *argvars, typval_T *rettv));
 static void f_system __ARGS((typval_T *argvars, typval_T *rettv));
+static void f_taglist __ARGS((typval_T *argvars, typval_T *rettv));
 static void f_tempname __ARGS((typval_T *argvars, typval_T *rettv));
 static void f_tolower __ARGS((typval_T *argvars, typval_T *rettv));
 static void f_toupper __ARGS((typval_T *argvars, typval_T *rettv));
@@ -6196,6 +6199,7 @@ static struct fst
     {"synIDattr",	2, 3, f_synIDattr},
     {"synIDtrans",	1, 1, f_synIDtrans},
     {"system",		1, 2, f_system},
+    {"taglist",		1, 1, f_taglist},
     {"tempname",	0, 0, f_tempname},
     {"tolower",		1, 1, f_tolower},
     {"toupper",		1, 1, f_toupper},
@@ -13133,6 +13137,35 @@ done:
     rettv->vval.v_string = res;
 }
 
+/*
+ * "gettags()" function
+ */
+    static void
+f_taglist(argvars, rettv)
+    typval_T  *argvars;
+    typval_T  *rettv;
+{
+    char_u  *tag_pattern;
+    list_T  *l;
+
+    tag_pattern = get_tv_string(&argvars[0]);
+
+    rettv->vval.v_number = FALSE;
+
+    l = list_alloc();
+    if (l != NULL)
+    {
+	if (get_tags(l, tag_pattern) != FAIL)
+	{
+	    rettv->vval.v_list = l;
+	    rettv->v_type = VAR_LIST;
+	    ++l->lv_refcount;
+	}
+	else
+	    list_free(l);
+    }
+}
+
 /*
  * "tempname()" function
  */
@@ -14010,7 +14043,7 @@ set_vim_var_nr(idx, val)
 }
 
 /*
- * Get number v: variable value;
+ * Get number v: variable value.
  */
     long
 get_vim_var_nr(idx)
@@ -14019,6 +14052,18 @@ get_vim_var_nr(idx)
     return vimvars[idx].vv_nr;
 }
 
+#if defined(FEAT_AUTOCMD) || defined(PROTO)
+/*
+ * Get string v: variable value.  Uses a static buffer, can only be used once.
+ */
+    char_u *
+get_vim_var_str(idx)
+    int		idx;
+{
+    return get_tv_string(&vimvars[idx].vv_tv);
+}
+#endif
+
 /*
  * Set v:count, v:count1 and v:prevcount.
  */
diff --git a/src/fileio.c b/src/fileio.c
index c3aef90a11..1edf0ae79a 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -1331,7 +1331,8 @@ retry:
 
 		/*
 		 * If there is conversion error or not enough room try using
-		 * another conversion.
+		 * another conversion.  Except for when there is no
+		 * alternative (help files).
 		 */
 		while ((iconv(iconv_fd, (void *)&fromp, &from_size,
 							       &top, &to_size)
@@ -2753,7 +2754,7 @@ buf_write(buf, fname, sfname, start, end, eap, append, forceit,
 	    if (!(did_cmd = apply_autocmds_exarg(EVENT_BUFWRITECMD,
 					 sfname, sfname, FALSE, curbuf, eap)))
 	    {
-		if (bt_nofile(curbuf))
+		if (overwriting && bt_nofile(curbuf))
 		    nofile_err = TRUE;
 		else
 		    apply_autocmds_exarg(EVENT_BUFWRITEPRE,
@@ -2765,7 +2766,7 @@ buf_write(buf, fname, sfname, start, end, eap, append, forceit,
 	    if (!(did_cmd = apply_autocmds_exarg(EVENT_FILEWRITECMD,
 					 sfname, sfname, FALSE, curbuf, eap)))
 	    {
-		if (bt_nofile(curbuf))
+		if (overwriting && bt_nofile(curbuf))
 		    nofile_err = TRUE;
 		else
 		    apply_autocmds_exarg(EVENT_FILEWRITEPRE,
@@ -5917,7 +5918,10 @@ buf_check_timestamp(buf, focus)
 #endif
 #ifdef FEAT_AUTOCMD
     static int	busy = FALSE;
+    int		n;
+    char_u	*s;
 #endif
+    char	*reason;
 
     /* If there is no file name, the buffer is not loaded, 'buftype' is
      * set, we are in the middle of a save or being called recursively: ignore
@@ -5975,15 +5979,26 @@ buf_check_timestamp(buf, focus)
 	    reload = TRUE;
 	else
 	{
-#ifdef FEAT_AUTOCMD
-	    int n;
+	    if (stat_res < 0)
+		reason = "deleted";
+	    else if (bufIsChanged(buf))
+		reason = "conflict";
+	    else if (orig_size != buf->b_orig_size || buf_contents_changed(buf))
+		reason = "changed";
+	    else if (orig_mode != buf->b_orig_mode)
+		reason = "mode";
+	    else
+		reason = "time";
 
+#ifdef FEAT_AUTOCMD
 	    /*
 	     * Only give the warning if there are no FileChangedShell
 	     * autocommands.
 	     * Avoid being called recursively by setting "busy".
 	     */
 	    busy = TRUE;
+	    set_vim_var_string(VV_FCS_REASON, (char_u *)reason, -1);
+	    set_vim_var_string(VV_FCS_CHOICE, (char_u *)"", -1);
 	    n = apply_autocmds(EVENT_FILECHANGEDSHELL,
 				      buf->b_fname, buf->b_fname, FALSE, buf);
 	    busy = FALSE;
@@ -5991,13 +6006,19 @@ buf_check_timestamp(buf, focus)
 	    {
 		if (!buf_valid(buf))
 		    EMSG(_("E246: FileChangedShell autocommand deleted buffer"));
-		return 2;
+		s = get_vim_var_str(VV_FCS_CHOICE);
+		if (STRCMP(s, "reload") == 0 && *reason != 'd')
+		    reload = TRUE;
+		else if (STRCMP(s, "ask") == 0)
+		    n = FALSE;
+		else
+		    return 2;
 	    }
-	    else
+	    if (!n)
 #endif
 	    {
-		if (stat_res < 0)
-		    mesg = _("E211: Warning: File \"%s\" no longer available");
+		if (*reason == 'd')
+		    mesg = _("E211: File \"%s\" no longer available");
 		else
 		{
 		    helpmesg = TRUE;
@@ -6010,13 +6031,22 @@ buf_check_timestamp(buf, focus)
 		     * checked out of CVS).  Always warn when the buffer was
 		     * changed.
 		     */
-		    if (bufIsChanged(buf))
+		    if (reason[2] == 'n')
+		    {
 			mesg = _("W12: Warning: File \"%s\" has changed and the buffer was changed in Vim as well");
-		    else if (orig_size != buf->b_orig_size
-			    || buf_contents_changed(buf))
+			mesg2 = _("See \":help W12\" for more info.");
+		    }
+		    else if (reason[1] == 'h')
+		    {
 			mesg = _("W11: Warning: File \"%s\" has changed since editing started");
-		    else if (orig_mode != buf->b_orig_mode)
+			mesg2 = _("See \":help W11\" for more info.");
+		    }
+		    else if (*reason == 'm')
+		    {
 			mesg = _("W16: Warning: Mode of file \"%s\" has changed since editing started");
+			mesg2 = _("See \":help W16\" for more info.");
+		    }
+		    /* Else: only timestamp changed, ignored */
 		}
 	    }
 	}
@@ -6038,9 +6068,7 @@ buf_check_timestamp(buf, focus)
 	path = home_replace_save(buf, buf->b_fname);
 	if (path != NULL)
 	{
-	    if (helpmesg)
-		mesg2 = _("See \":help W11\" for more info.");
-	    else
+	    if (!helpmesg)
 		mesg2 = "";
 	    tbuf = alloc((unsigned)(STRLEN(path) + STRLEN(mesg)
 							+ STRLEN(mesg2) + 2));
diff --git a/src/getchar.c b/src/getchar.c
index 8328e19a1d..e93ce05290 100644
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -1483,10 +1483,14 @@ vgetc()
 #endif
 	   )
 	{
+	    int	    save_allow_keys = allow_keys;
+
 	    ++no_mapping;
+	    allow_keys = 0;		/* make sure BS is not found */
 	    c2 = vgetorpeek(TRUE);	/* no mapping for these chars */
 	    c = vgetorpeek(TRUE);
 	    --no_mapping;
+	    allow_keys = save_allow_keys;
 	    if (c2 == KS_MODIFIER)
 	    {
 		mod_mask = c;
diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index 8abdf86136..debc11bc45 100644
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -896,6 +896,38 @@ keyval_to_string(unsigned int keyval, unsigned int state, char_u *string)
 }
 #endif /* HAVE_GTK2 */
 
+    static int
+modifiers_gdk2vim(guint state)
+{
+    int modifiers = 0;
+
+    if (state & GDK_SHIFT_MASK)
+	modifiers |= MOD_MASK_SHIFT;
+    if (state & GDK_CONTROL_MASK)
+	modifiers |= MOD_MASK_CTRL;
+    if (state & GDK_MOD1_MASK)
+	modifiers |= MOD_MASK_ALT;
+    if (state & GDK_MOD4_MASK)
+	modifiers |= MOD_MASK_META;
+
+    return modifiers;
+}
+
+    static int
+modifiers_gdk2mouse(guint state)
+{
+    int modifiers = 0;
+
+    if (state & GDK_SHIFT_MASK)
+	modifiers |= MOUSE_SHIFT;
+    if (state & GDK_CONTROL_MASK)
+	modifiers |= MOUSE_CTRL;
+    if (state & GDK_MOD1_MASK)
+	modifiers |= MOUSE_ALT;
+
+    return modifiers;
+}
+
 /*
  * Main keyboard handler:
  */
@@ -1112,13 +1144,7 @@ key_press_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
 #endif
 	    )
     {
-	modifiers = 0;
-	if (state & GDK_SHIFT_MASK)
-	    modifiers |= MOD_MASK_SHIFT;
-	if (state & GDK_CONTROL_MASK)
-	    modifiers |= MOD_MASK_CTRL;
-	if (state & GDK_MOD1_MASK)
-	    modifiers |= MOD_MASK_ALT;
+	modifiers = modifiers_gdk2vim(state);
 
 	/*
 	 * For some keys a shift modifier is translated into another key
@@ -1598,13 +1624,7 @@ process_motion_notify(int x, int y, GdkModifierType state)
     }
 
     /* translate modifier coding between the main engine and GTK */
-    vim_modifiers = 0x0;
-    if (state & GDK_SHIFT_MASK)
-	vim_modifiers |= MOUSE_SHIFT;
-    if (state & GDK_CONTROL_MASK)
-	vim_modifiers |= MOUSE_CTRL;
-    if (state & GDK_MOD1_MASK)
-	vim_modifiers |= MOUSE_ALT;
+    vim_modifiers = modifiers_gdk2mouse(state);
 
     /* inform the editor engine about the occurence of this event */
     gui_send_mouse_event(button, x, y, FALSE, vim_modifiers);
@@ -1796,13 +1816,7 @@ button_press_event(GtkWidget *widget, GdkEventButton *event, gpointer data)
 	xim_reset();
 #endif
 
-    vim_modifiers = 0x0;
-    if (event->state & GDK_SHIFT_MASK)
-	vim_modifiers |= MOUSE_SHIFT;
-    if (event->state & GDK_CONTROL_MASK)
-	vim_modifiers |= MOUSE_CTRL;
-    if (event->state & GDK_MOD1_MASK)
-	vim_modifiers |= MOUSE_ALT;
+    vim_modifiers = modifiers_gdk2mouse(event->state);
 
     gui_send_mouse_event(button, x, y, repeated_click, vim_modifiers);
     if (gtk_main_level() > 0)
@@ -1821,7 +1835,7 @@ button_press_event(GtkWidget *widget, GdkEventButton *event, gpointer data)
 scroll_event(GtkWidget *widget, GdkEventScroll *event, gpointer data)
 {
     int	    button;
-    int_u   vim_modifiers = 0;
+    int_u   vim_modifiers;
 
     if (gtk_socket_id != 0 && !GTK_WIDGET_HAS_FOCUS(widget))
 	gtk_widget_grab_focus(widget);
@@ -1844,12 +1858,7 @@ scroll_event(GtkWidget *widget, GdkEventScroll *event, gpointer data)
 	xim_reset();
 # endif
 
-    if (event->state & GDK_SHIFT_MASK)
-	vim_modifiers |= MOUSE_SHIFT;
-    if (event->state & GDK_CONTROL_MASK)
-	vim_modifiers |= MOUSE_CTRL;
-    if (event->state & GDK_MOD1_MASK)
-	vim_modifiers |= MOUSE_ALT;
+    vim_modifiers = modifiers_gdk2mouse(event->state);
 
     gui_send_mouse_event(button, (int)event->x, (int)event->y,
 							FALSE, vim_modifiers);
@@ -1881,13 +1890,7 @@ button_release_event(GtkWidget *widget, GdkEventButton *event, gpointer data)
     x = event->x;
     y = event->y;
 
-    vim_modifiers = 0x0;
-    if (event->state & GDK_SHIFT_MASK)
-	vim_modifiers |= MOUSE_SHIFT;
-    if (event->state & GDK_CONTROL_MASK)
-	vim_modifiers |= MOUSE_CTRL;
-    if (event->state & GDK_MOD1_MASK)
-	vim_modifiers |= MOUSE_ALT;
+    vim_modifiers = modifiers_gdk2mouse(event->state);
 
     gui_send_mouse_event(MOUSE_RELEASE, x, y, FALSE, vim_modifiers);
     if (gtk_main_level() > 0)
@@ -2001,16 +2004,11 @@ drag_handle_uri_list(GdkDragContext	*context,
 
     if (fnames != NULL && nfiles > 0)
     {
-	int_u   modifiers = 0;
+	int_u   modifiers;
 
 	gtk_drag_finish(context, TRUE, FALSE, time_); /* accept */
 
-	if (state & GDK_SHIFT_MASK)
-	    modifiers |= MOUSE_SHIFT;
-	if (state & GDK_CONTROL_MASK)
-	    modifiers |= MOUSE_CTRL;
-	if (state & GDK_MOD1_MASK)
-	    modifiers |= MOUSE_ALT;
+	modifiers = modifiers_gdk2mouse(state);
 
 	gui_handle_drop(x, y, modifiers, fnames, nfiles);
     }
@@ -2061,12 +2059,7 @@ drag_handle_text(GdkDragContext	    *context,
     vim_free(tmpbuf);
 # endif
 
-    if (state & GDK_SHIFT_MASK)
-	dropkey[2] |= MOD_MASK_SHIFT;
-    if (state & GDK_CONTROL_MASK)
-	dropkey[2] |= MOD_MASK_CTRL;
-    if (state & GDK_MOD1_MASK)
-	dropkey[2] |= MOD_MASK_ALT;
+    dropkey[2] = modifiers_gdk2vim(state);
 
     if (dropkey[2] != 0)
 	add_to_input_buf(dropkey, (int)sizeof(dropkey));
diff --git a/src/gui_w32.c b/src/gui_w32.c
index d6d37c4d16..2308362476 100644
--- a/src/gui_w32.c
+++ b/src/gui_w32.c
@@ -1958,7 +1958,7 @@ gui_mch_draw_string(
 	    ++clen;
 	}
 	ExtTextOutW(s_hdc, TEXT_X(col), TEXT_Y(row),
-			     foptions, pcliprect, unicodebuf, clen, unicodepdy);
+			   foptions, pcliprect, unicodebuf, clen, unicodepdy);
 	len = cells;	/* used for underlining */
     }
     else if ((enc_codepage > 0 && (int)GetACP() != enc_codepage) || enc_latin9)
@@ -1975,8 +1975,26 @@ gui_mch_draw_string(
 			(char *)text, len,
 			(LPWSTR)unicodebuf, unibuflen);
 	    if (len != 0)
+	    {
+		/* Use unicodepdy to make characters fit as we expect, even
+		 * when the font uses different widths (e.g., bold character
+		 * is wider). */
+		if (unicodepdy != NULL)
+		{
+		    int i;
+		    int cw;
+
+		    for (i = 0; i < len; ++i)
+		    {
+			cw = utf_char2cells(unicodebuf[i]);
+			if (cw > 2)
+			    cw = 1;
+			unicodepdy[i] = cw * gui.char_width;
+		    }
+		}
 		ExtTextOutW(s_hdc, TEXT_X(col), TEXT_Y(row),
-			      foptions, pcliprect, unicodebuf, len, NULL);
+			    foptions, pcliprect, unicodebuf, len, unicodepdy);
+	    }
 	}
     }
     else
diff --git a/src/gui_x11.c b/src/gui_x11.c
index 6d990c5d1b..809054f0f7 100644
--- a/src/gui_x11.c
+++ b/src/gui_x11.c
@@ -998,6 +998,8 @@ gui_x11_key_hit_cb(w, dud, event, dum)
 	    modifiers |= MOD_MASK_CTRL;
 	if (ev_press->state & Mod1Mask)
 	    modifiers |= MOD_MASK_ALT;
+	if (ev_press->state & Mod4Mask)
+	    modifiers |= MOD_MASK_META;
 
 	/*
 	 * For some keys a shift modifier is translated into another key
diff --git a/src/keymap.h b/src/keymap.h
index cb79ad1e18..5babdf4af8 100644
--- a/src/keymap.h
+++ b/src/keymap.h
@@ -458,23 +458,24 @@ enum key_extra
 #define MOD_MASK_SHIFT	    0x02
 #define MOD_MASK_CTRL	    0x04
 #define MOD_MASK_ALT	    0x08	/* aka META */
-#define MOD_MASK_2CLICK	    0x10	/* use MOD_MASK_MULTI_CLICK */
-#define MOD_MASK_3CLICK	    0x20	/* use MOD_MASK_MULTI_CLICK */
-#define MOD_MASK_4CLICK	    0x30	/* use MOD_MASK_MULTI_CLICK */
+#define MOD_MASK_META	    0x10	/* META when it's different from ALT */
+#define MOD_MASK_2CLICK	    0x20	/* use MOD_MASK_MULTI_CLICK */
+#define MOD_MASK_3CLICK	    0x40	/* use MOD_MASK_MULTI_CLICK */
+#define MOD_MASK_4CLICK	    0x60	/* use MOD_MASK_MULTI_CLICK */
 #ifdef MACOS
-# define MOD_MASK_CMD	     0x80
+# define MOD_MASK_CMD	    0x80
 #endif
 
 #define MOD_MASK_MULTI_CLICK	(MOD_MASK_2CLICK|MOD_MASK_3CLICK|MOD_MASK_4CLICK)
 
 /*
  * The length of the longest special key name, including modifiers.
- * Current longest is <M-C-S-4-MiddleRelease> (length includes '<' and '>').
+ * Current longest is <M-C-S-T-4-MiddleRelease> (length includes '<' and '>').
  */
-#define MAX_KEY_NAME_LEN    23
+#define MAX_KEY_NAME_LEN    25
 
 /* Maximum length of a special key event as tokens.  This includes modifiers.
- * The longest event is something like <M-C-S-4-LeftDrag> which would be the
+ * The longest event is something like <M-C-S-T-4-LeftDrag> which would be the
  * following string of tokens:
  *
  * <K_SPECIAL> <KS_MODIFIER> bitmask <K_SPECIAL> <KS_EXTRA> <KT_LEFTDRAG>.
diff --git a/src/misc2.c b/src/misc2.c
index d5a80929be..9b21168d84 100644
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -1644,6 +1644,7 @@ static struct modmasktable
 } mod_mask_table[] =
 {
     {MOD_MASK_ALT,		MOD_MASK_ALT,		(char_u)'M'},
+    {MOD_MASK_META,		MOD_MASK_META,		(char_u)'T'},
     {MOD_MASK_CTRL,		MOD_MASK_CTRL,		(char_u)'C'},
     {MOD_MASK_SHIFT,		MOD_MASK_SHIFT,		(char_u)'S'},
     {MOD_MASK_MULTI_CLICK,	MOD_MASK_2CLICK,	(char_u)'2'},
diff --git a/src/normal.c b/src/normal.c
index 2d2efc2f31..9bf2e66b7c 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -2257,7 +2257,8 @@ do_mouse(oap, c, dir, count, fixindent)
      * multiple clicks and the middle mouse button.
      * Accept shift-leftmouse drags when 'mousemodel' is "popup.*".
      */
-    if ((mod_mask & (MOD_MASK_SHIFT | MOD_MASK_CTRL | MOD_MASK_ALT))
+    if ((mod_mask & (MOD_MASK_SHIFT | MOD_MASK_CTRL | MOD_MASK_ALT
+							     | MOD_MASK_META))
 	    && (!is_click
 		|| (mod_mask & MOD_MASK_MULTI_CLICK)
 		|| which_button == MOUSE_MIDDLE)
diff --git a/src/option.c b/src/option.c
index 5cf1b46209..e7210b3f96 100644
--- a/src/option.c
+++ b/src/option.c
@@ -3149,11 +3149,13 @@ set_init_2()
 	 * with a dark background, that can handle color.  Recognized are:
 	 * "linux"	    Linux console
 	 * "screen.linux"   Linux console with screen
+	 * "cygwin"	    Cygwin shell
 	 */
 	idx = findoption((char_u *)"bg");
 	if (!(options[idx].flags & P_WAS_SET)
 		&& (STRCMP(T_NAME, "linux") == 0
-		    || STRCMP(T_NAME, "screen.linux") == 0))
+		    || STRCMP(T_NAME, "screen.linux") == 0
+		    || STRCMP(T_NAME, "cygwin") == 0))
 	{
 	    set_string_option_direct(NULL, idx, (char_u *)"dark", OPT_FREE);
 	    /* don't mark it as set, when starting the GUI it may be changed
diff --git a/src/os_mac_conv.c b/src/os_mac_conv.c
index 68d46c0f2b..eed0ebbe96 100644
--- a/src/os_mac_conv.c
+++ b/src/os_mac_conv.c
@@ -292,7 +292,13 @@ mac_conv_init()
 
     if (TECCreateConverter(&gUTF16ToUTF8Converter, utf16_encoding,
 		utf8_canon_encoding) != noErr)
-	gUTF16ToUTF8Converter = NULL;
+    {
+	/* On pre-10.3, Unicode normalization is not available so
+	 * fall back to non-normalizing converter */
+	if (TECCreateConverter(&gUTF16ToUTF8Converter, utf16_encoding,
+		    utf8_encoding) != noErr)
+	    gUTF16ToUTF8Converter = NULL;
+    }
 }
 
 /*
diff --git a/src/os_mswin.c b/src/os_mswin.c
index 4f3a49bef2..5e96da8afe 100644
--- a/src/os_mswin.c
+++ b/src/os_mswin.c
@@ -385,6 +385,7 @@ mch_FullName(
     else
 #endif
     {
+#ifdef FEAT_MBYTE
 	if (enc_codepage >= 0 && (int)GetACP() != enc_codepage
 # ifdef __BORLANDC__
 		/* Wide functions of Borland C 5.5 do not work on Windows 98. */
@@ -415,7 +416,6 @@ mch_FullName(
 	    vim_free(wname);
 	    vim_free(cname);
 	}
-#ifdef FEAT_MBYTE
 	if (nResult == FAIL)	    /* fall back to non-wide function */
 #endif
 	{
@@ -2487,8 +2487,13 @@ serverSendEnc(HWND target)
     COPYDATASTRUCT data;
 
     data.dwData = COPYDATA_ENCODING;
+#ifdef FEAT_MBYTE
     data.cbData = STRLEN(p_enc) + 1;
     data.lpData = p_enc;
+#else
+    data.cbData = STRLEN("latin1") + 1;
+    data.lpData = "latin1";
+#endif
     (void)SendMessage(target, WM_COPYDATA, (WPARAM)message_window,
 							     (LPARAM)(&data));
 }
diff --git a/src/po/ja.po b/src/po/ja.po
index 17d94d5160..8b8559efcb 100644
--- a/src/po/ja.po
+++ b/src/po/ja.po
@@ -3,188 +3,188 @@
 # Do ":help uganda"  in Vim to read copying and usage conditions.
 # Do ":help credits" in Vim to see a list of people who contributed.
 #
-# MURAOKA Taro <koron@tka.att.ne.jp>, 2001-4.
-# Last Change: 29-Apr-2004.
+# MURAOKA Taro <koron@tka.att.ne.jp>, 2001-5.
+# Last Change: 05-Mar-2005.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Vim 6.2\n"
-"POT-Creation-Date: 2004-04-29 13:16+0900\n"
-"PO-Revision-Date: 2004-04-29 13:00+0900\n"
+"Project-Id-Version: Vim 7.0\n"
+"POT-Creation-Date: 2005-03-04 13:11+0900\n"
+"PO-Revision-Date: 2004-03-05 00:50+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"
 "Content-Type: text/plain; charset=euc-jp\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: buffer.c:102
+#: ../buffer.c:102
 msgid "E82: Cannot allocate any buffer, exiting..."
 msgstr "E82: バッファを1つも作成できないので, 終了します..."
 
-#: buffer.c:105
+#: ../buffer.c:105
 msgid "E83: Cannot allocate buffer, using other one..."
 msgstr "E83: バッファを作成できないので, 他のを使用します..."
 
-#: buffer.c:805
+#: ../buffer.c:857
 msgid "E515: No buffers were unloaded"
 msgstr "E515: 解放されたバッファはありません"
 
-#: buffer.c:807
+#: ../buffer.c:859
 msgid "E516: No buffers were deleted"
 msgstr "E516: 削除されたバッファはありません"
 
-#: buffer.c:809
+#: ../buffer.c:861
 msgid "E517: No buffers were wiped out"
 msgstr "E517: 破棄されたバッファはありません"
 
-#: buffer.c:817
+#: ../buffer.c:869
 msgid "1 buffer unloaded"
 msgstr "1 個のバッファが解放されました"
 
-#: buffer.c:819
+#: ../buffer.c:871
 #, c-format
 msgid "%d buffers unloaded"
 msgstr "%d 個のバッファが解放されました"
 
-#: buffer.c:824
+#: ../buffer.c:876
 msgid "1 buffer deleted"
 msgstr "1 個のバッファが削除されました"
 
-#: buffer.c:826
+#: ../buffer.c:878
 #, c-format
 msgid "%d buffers deleted"
 msgstr "%d 個のバッファが削除されました"
 
-#: buffer.c:831
+#: ../buffer.c:883
 msgid "1 buffer wiped out"
 msgstr "1 個のバッファが破棄されました"
 
-#: buffer.c:833
+#: ../buffer.c:885
 #, c-format
 msgid "%d buffers wiped out"
 msgstr "%d 個のバッファが破棄されました"
 
-#: buffer.c:894
+#: ../buffer.c:946
 msgid "E84: No modified buffer found"
 msgstr "E84: 変更されたバッファはありません"
 
 #. back where we started, didn't find anything.
-#: buffer.c:933
+#: ../buffer.c:985
 msgid "E85: There is no listed buffer"
 msgstr "E85: リスト表示されるバッファはありません"
 
-#: buffer.c:945
+#: ../buffer.c:997
 #, c-format
 msgid "E86: Buffer %ld does not exist"
 msgstr "E86: バッファ %ld はありません"
 
-#: buffer.c:948
+#: ../buffer.c:1000
 msgid "E87: Cannot go beyond last buffer"
 msgstr "E87: 最後のバッファを越えて移動はできません"
 
-#: buffer.c:950
+#: ../buffer.c:1002
 msgid "E88: Cannot go before first buffer"
 msgstr "E88: 最初のバッファより前へは移動できません"
 
-#: buffer.c:988
+#: ../buffer.c:1044
 #, c-format
 msgid "E89: No write since last change for buffer %ld (add ! to override)"
 msgstr "E89: バッファ %ld の変更は保存されていません (! で変更を破棄)"
 
-#: buffer.c:1005
+#: ../buffer.c:1061
 msgid "E90: Cannot unload last buffer"
 msgstr "E90: 最後のバッファは解放できません"
 
-#: buffer.c:1538
+#: ../buffer.c:1611
 msgid "W14: Warning: List of file names overflow"
-msgstr "W14: 警告: ファイル名のリストが長すぎます"
+msgstr "W14: 警告: ファイル名のリストが長過ぎます"
 
-#: buffer.c:1709
+#: ../buffer.c:1795
 #, c-format
 msgid "E92: Buffer %ld not found"
 msgstr "E92: バッファ %ld がみつかりません"
 
-#: buffer.c:1940
+#: ../buffer.c:2058
 #, c-format
 msgid "E93: More than one match for %s"
 msgstr "E93: %s に複数の該当がありました"
 
-#: buffer.c:1942
+#: ../buffer.c:2060
 #, c-format
 msgid "E94: No matching buffer for %s"
 msgstr "E94: %s に該当するバッファはありませんでした"
 
-#: buffer.c:2337
+#: ../buffer.c:2473
 #, c-format
 msgid "line %ld"
 msgstr "行 %ld"
 
-#: buffer.c:2420
+#: ../buffer.c:2561
 msgid "E95: Buffer with this name already exists"
 msgstr "E95: この名前のバッファは既にあります"
 
-#: buffer.c:2713
+#: ../buffer.c:2878
 msgid " [Modified]"
 msgstr " [変更あり]"
 
-#: buffer.c:2718
+#: ../buffer.c:2883
 msgid "[Not edited]"
 msgstr "[未編集]"
 
-#: buffer.c:2723
+#: ../buffer.c:2888
 msgid "[New file]"
 msgstr "[新ファイル]"
 
-#: buffer.c:2724
+#: ../buffer.c:2889
 msgid "[Read errors]"
 msgstr "[読込エラー]"
 
-#: buffer.c:2726 fileio.c:2049
+#: ../buffer.c:2891 ../fileio.c:2106 ../netbeans.c:3418
 msgid "[readonly]"
 msgstr "[読込専用]"
 
-#: buffer.c:2747
+#: ../buffer.c:2912
 msgid "1 line --%d%%--"
 msgstr "1 行 --%d%%--"
 
-#: buffer.c:2749
+#: ../buffer.c:2914
 msgid "%ld lines --%d%%--"
 msgstr "%ld 行 --%d%%--"
 
-#: buffer.c:2756
+#: ../buffer.c:2921
 msgid "line %ld of %ld --%d%%-- col "
 msgstr "行 %ld (全体 %ld) --%d%%-- col "
 
-#: buffer.c:2864
-msgid "[No file]"
-msgstr "[無題]"
+#: ../buffer.c:3029 ../buffer.c:4750 ../memline.c:1657
+msgid "[No Name]"
+msgstr "[無名]"
 
 #. must be a help buffer
-#: buffer.c:2904
+#: ../buffer.c:3068
 msgid "help"
 msgstr "ヘルプ"
 
-#: buffer.c:3463 screen.c:5038
+#: ../buffer.c:3619 ../screen.c:5071
 msgid "[help]"
 msgstr "[ヘルプ]"
 
-#: buffer.c:3495 screen.c:5044
+#: ../buffer.c:3651 ../screen.c:5077
 msgid "[Preview]"
 msgstr "[プレビュー]"
 
-#: buffer.c:3775
+#: ../buffer.c:3931
 msgid "All"
 msgstr "全て"
 
-#: buffer.c:3775
+#: ../buffer.c:3931
 msgid "Bot"
 msgstr "末尾"
 
-#: buffer.c:3777
+#: ../buffer.c:3933
 msgid "Top"
 msgstr "先頭"
 
-#: buffer.c:4523
+#: ../buffer.c:4702
 msgid ""
 "\n"
 "# Buffer list:\n"
@@ -192,15 +192,11 @@ msgstr ""
 "\n"
 "# バッファリスト:\n"
 
-#: buffer.c:4556
+#: ../buffer.c:4737
 msgid "[Error List]"
 msgstr "[エラーリスト]"
 
-#: buffer.c:4569 memline.c:1520
-msgid "[No File]"
-msgstr "[無題]"
-
-#: buffer.c:4882
+#: ../buffer.c:5063
 msgid ""
 "\n"
 "--- Signs ---"
@@ -208,150 +204,154 @@ msgstr ""
 "\n"
 "--- サイン ---"
 
-#: buffer.c:4901
+#: ../buffer.c:5082
 #, c-format
 msgid "Signs for %s:"
 msgstr "%s のサイン:"
 
-#: buffer.c:4907
+#: ../buffer.c:5088
 #, c-format
 msgid "    line=%ld  id=%d  name=%s"
 msgstr "    行=%ld  識別子=%d  名前=%s"
 
-#: diff.c:139
+#: ../diff.c:163
 #, c-format
 msgid "E96: Can not diff more than %ld buffers"
 msgstr "E96: %ld 以上のバッファはdiffできません"
 
-#: diff.c:709
+#: ../diff.c:737
 msgid "E97: Cannot create diffs"
 msgstr "E97: 差分を作成できません "
 
-#: diff.c:814
+#: ../diff.c:843
 msgid "Patch file"
 msgstr "パッチファイル"
 
-#: diff.c:1065
+#: ../diff.c:1146
 msgid "E98: Cannot read diff output"
 msgstr "E98: diffの出力を読込めません"
 
-#: diff.c:1815
+#: ../diff.c:1896
 msgid "E99: Current buffer is not in diff mode"
 msgstr "E99: 現在のバッファは差分モードではありません"
 
-#: diff.c:1827
+#: ../diff.c:1908
 msgid "E100: No other buffer in diff mode"
 msgstr "E100: 差分モードである他のバッファはありません"
 
-#: diff.c:1835
+#: ../diff.c:1916
 msgid "E101: More than two buffers in diff mode, don't know which one to use"
 msgstr ""
 "E101: 差分モードのバッファが2個以上あるので、どれを使うか特定できません"
 
-#: diff.c:1858
+#: ../diff.c:1939
 #, c-format
 msgid "E102: Can't find buffer \"%s\""
 msgstr "E102: バッファ \"%s\" がみつかりません"
 
-#: diff.c:1864
+#: ../diff.c:1945
 #, c-format
 msgid "E103: Buffer \"%s\" is not in diff mode"
 msgstr "E103: バッファ \"%s\" は差分モードではありません"
 
-#: digraph.c:2199
+#: ../digraph.c:2200
 msgid "E104: Escape not allowed in digraph"
 msgstr "E104: 合字にEscapeは使用できません"
 
-#: digraph.c:2384
+#: ../digraph.c:2384
 msgid "E544: Keymap file not found"
 msgstr "E544: キーマップファイルがみつかりません"
 
-#: digraph.c:2411
+#: ../digraph.c:2411
 msgid "E105: Using :loadkeymap not in a sourced file"
 msgstr "E105: :source で取込むファイル以外では :loadkeymap を使えません"
 
-#: edit.c:40
+#: ../edit.c:41
 msgid " Keyword completion (^N^P)"
 msgstr " キーワード補完 (^N^P)"
 
 #. ctrl_x_mode == 0, ^P/^N compl.
-#: edit.c:41
-msgid " ^X mode (^E^Y^L^]^F^I^K^D^V^N^P)"
-msgstr " ^X モード (^E^Y^L^]^F^I^K^D^V^N^P)"
+#: ../edit.c:42
+msgid " ^X mode (^E^Y^L^]^F^I^K^D^U^V^N^P)"
+msgstr " ^X モード (^E^Y^L^]^F^I^K^D^U^V^N^P)"
 
 #. Scroll has it's own msgs, in it's place there is the msg for local
 #. * ctrl_x_mode = 0 (eg continue_status & CONT_LOCAL)  -- Acevedo
-#: edit.c:44
+#: ../edit.c:45
 msgid " Keyword Local completion (^N^P)"
 msgstr " 局所キーワード補完 (^N^P)"
 
-#: edit.c:45
+#: ../edit.c:46
 msgid " Whole line completion (^L^N^P)"
 msgstr " 行(全体)補完 (^L^N^P)"
 
-#: edit.c:46
+#: ../edit.c:47
 msgid " File name completion (^F^N^P)"
 msgstr "ファイル名補完 (^F^N^P)"
 
-#: edit.c:47
+#: ../edit.c:48
 msgid " Tag completion (^]^N^P)"
 msgstr " タグ補完 (^]^N^P)"
 
-#: edit.c:48
+#: ../edit.c:49
 msgid " Path pattern completion (^N^P)"
 msgstr " パスパターン補完 (^N^P)"
 
-#: edit.c:49
+#: ../edit.c:50
 msgid " Definition completion (^D^N^P)"
 msgstr " 定義補完 (^D^N^P)"
 
-#: edit.c:51
+#: ../edit.c:52
 msgid " Dictionary completion (^K^N^P)"
 msgstr " 辞書補完 (^K^N^P)"
 
-#: edit.c:52
+#: ../edit.c:53
 msgid " Thesaurus completion (^T^N^P)"
 msgstr " シソーラス補完 (^T^N^P)"
 
-#: edit.c:53
+#: ../edit.c:54
 msgid " Command-line completion (^V^N^P)"
 msgstr " コマンドライン補完 (^V^N^P)"
 
-#: edit.c:56
+#: ../edit.c:55
+msgid " User defined completion (^U^N^P)"
+msgstr " ユーザ定義補完 (^U^N^P)"
+
+#: ../edit.c:58
 msgid "Hit end of paragraph"
 msgstr "段落の最後にヒット"
 
-#: edit.c:962
+#: ../edit.c:994
 msgid "'thesaurus' option is empty"
 msgstr "'thesaurus' オプションが空です"
 
-#: edit.c:1166
+#: ../edit.c:1204
 msgid "'dictionary' option is empty"
 msgstr "'dictionary' オプションが空です"
 
-#: edit.c:2162
+#: ../edit.c:2204
 #, c-format
 msgid "Scanning dictionary: %s"
 msgstr "辞書をスキャン中: %s"
 
-#: edit.c:2368
+#: ../edit.c:2410
 msgid " (insert) Scroll (^E/^Y)"
 msgstr " (挿入) スクロール(^E/^Y)"
 
-#: edit.c:2370
+#: ../edit.c:2412
 msgid " (replace) Scroll (^E/^Y)"
 msgstr " (置換) スクロール (^E/^Y)"
 
-#: edit.c:2684
+#: ../edit.c:2813
 #, c-format
 msgid "Scanning: %s"
 msgstr "スキャン中: %s"
 
-#: edit.c:2719
+#: ../edit.c:2848
 msgid "Scanning tags."
 msgstr "タグをスキャン中."
 
-#: edit.c:3381
+#: ../edit.c:3549
 msgid " Adding"
 msgstr " 追加中"
 
@@ -359,121 +359,283 @@ msgstr " 
 #. * be called before line = ml_get(), or when this address is no
 #. * longer needed.  -- Acevedo.
 #.
-#: edit.c:3430
+#: ../edit.c:3598
 msgid "-- Searching..."
 msgstr "-- 検索中..."
 
-#: edit.c:3486
+#: ../edit.c:3654
 msgid "Back at original"
 msgstr "始めに戻る"
 
-#: edit.c:3491
+#: ../edit.c:3659
 msgid "Word from other line"
 msgstr "他の行の単語"
 
-#: edit.c:3496
+#: ../edit.c:3664
 msgid "The only match"
 msgstr "唯一の該当"
 
-#: edit.c:3555
+#: ../edit.c:3723
 #, c-format
 msgid "match %d of %d"
 msgstr "%d 番目の該当 (全該当 %d 個中)"
 
-#: edit.c:3558
+#: ../edit.c:3726
 #, c-format
 msgid "match %d"
 msgstr "%d 番目の該当"
 
-#. Skip further arguments but do continue to
-#. * search for a trailing command.
-#: eval.c:1024
+#: ../eval.c:93
+msgid "E18: Unexpected characters in :let"
+msgstr "E18: 予期せぬ文字が :let にありました"
+
+#: ../eval.c:94
+#, c-format
+msgid "E684: list index out of range: %ld"
+msgstr "E684: リストのインデックスが範囲外です: %ld"
+
+#: ../eval.c:95
+#, c-format
+msgid "E121: Undefined variable: %s"
+msgstr "E121: 未定義の変数です: %s"
+
+#: ../eval.c:96
+msgid "E111: Missing ']'"
+msgstr "E111: ']' がみつかりません"
+
+#: ../eval.c:97
 #, c-format
-msgid "E106: Unknown variable: \"%s\""
-msgstr "E106: 未知の変数: \"%s\""
+msgid "E686: Argument of %s must be a List"
+msgstr "E686: %s の引数はリスト型でなければなりません"
+
+#: ../eval.c:98
+#, c-format
+msgid "E712: Argument of %s must be a List or Dictionaary"
+msgstr "E712: %s の引数はリスト型または辞書型でなければなりません"
+
+#: ../eval.c:99
+msgid "E713: Cannot use empty key for Dictionary"
+msgstr "E713: 辞書型に空のキーを使うことはできません"
+
+#: ../eval.c:100
+msgid "E714: List required"
+msgstr "E471: リスト型が必要です"
+
+#: ../eval.c:101
+msgid "E715: Dictionary required"
+msgstr "E715: 辞書型が必要です"
+
+#: ../eval.c:102
+#, c-format
+msgid "E118: Too many arguments for function: %s"
+msgstr "E118: 関数の引数が多過ぎます: %s"
+
+#: ../eval.c:103
+#, c-format
+msgid "E716: Key not present in Dictionary: %s"
+msgstr "E716: 辞書型にキーが存在しません: %s"
+
+#: ../eval.c:104
+#, c-format
+msgid "E122: Function %s already exists, add ! to replace it"
+msgstr "E122: 関数 %s は定義済です, 再定義するには ! を追加してください"
+
+#: ../eval.c:105
+msgid "E717: Dictionary entry already exists"
+msgstr "E717: 辞書型内にエントリが既に存在します"
+
+#: ../eval.c:106
+msgid "E718: Funcref required"
+msgstr "E718: 関数参照型が要求されます"
+
+#: ../eval.c:107
+msgid "E719: Cannot use [:] with a Dictionary"
+msgstr "E719: [:] を辞書型と組み合わせては使えません"
+
+#: ../eval.c:108
+#, c-format
+msgid "E734: Wrong variable type for %s="
+msgstr "E734: 異なった型の変数です %s="
+
+#: ../eval.c:109
+#, c-format
+msgid "E130: Unknown function: %s"
+msgstr "E130: 未知の関数です: %s"
+
+#: ../eval.c:1428
+msgid "E687: Less targets than List items"
+msgstr "E687: ターゲットがリスト型内の要素よりも少ないです"
+
+#: ../eval.c:1433
+msgid "E688: More targets than List items"
+msgstr "E688: ターゲットがリスト型内の要素よりも多いです"
+
+#: ../eval.c:1519
+msgid "Double ; in list of variables"
+msgstr "リスト型の値に2つ以上の ; が検出されました"
+
+#: ../eval.c:1685
+#, c-format
+msgid "E738: Can't list variables for %s"
+msgstr "E738: %s の値を一覧表示できません"
+
+#: ../eval.c:2020
+msgid "E689: Can only index a List or Dictionary"
+msgstr "E689: リスト型と辞書型以外はインデックス指定できません"
+
+#: ../eval.c:2026
+msgid "E708: [:] must come last"
+msgstr "E708: [:] は最後でなければいけません"
+
+#: ../eval.c:2072
+msgid "E709: [:] requires a List value"
+msgstr "E709: [:] にはリスト型の値が必要です"
+
+#: ../eval.c:2308
+msgid "E710: List value has more items than target"
+msgstr "E710: リスト型変数にターゲットよりも多い要素があります"
+
+#: ../eval.c:2312
+msgid "E711: List value has not enough items"
+msgstr "E711: リスト型変数に十分な数の要素がありません"
+
+#
+#: ../eval.c:2506
+msgid "E690: Missing \"in\" after :for"
+msgstr "E690: :for の後に \"in\" がありません"
 
-#: eval.c:1320
+#: ../eval.c:2721
 #, c-format
 msgid "E107: Missing braces: %s"
 msgstr "E107: カッコ '(' がありません: %s"
 
-#: eval.c:1435 eval.c:1449
+#: ../eval.c:2947
 #, c-format
 msgid "E108: No such variable: \"%s\""
 msgstr "E108: その変数はありません: \"%s\""
 
-#: eval.c:1705
+#: ../eval.c:3034
+msgid "E743: variable nested too deep for (un)lock"
+msgstr "E743: (アンチ)ロックするには変数の入れ子が深過ぎます"
+
+#: ../eval.c:3336
 msgid "E109: Missing ':' after '?'"
 msgstr "E109: '?' の後に ':' がありません"
 
-#: eval.c:2327
+#: ../eval.c:3628
+msgid "E691: Can only compare List with List"
+msgstr "E691: リスト型はリスト型としか比較できません"
+
+#: ../eval.c:3630
+msgid "E692: Invalid operation for Lists"
+msgstr "E692: リスト型には無効な操作です"
+
+#: ../eval.c:3657
+msgid "E735: Can only compare Dictionary with Dictionary"
+msgstr "E735: 辞書型は辞書型としか比較できません"
+
+#: ../eval.c:3659
+msgid "E736: Invalid operation for Dictionary"
+msgstr "E736: 辞書型には無効な操作です"
+
+#: ../eval.c:3679
+msgid "E693: Can only compare Funcref with Funcref"
+msgstr "E693: 関数参照型は関数参照型としか比較できません"
+
+#: ../eval.c:3681
+msgid "E694: Invalid operation for Funcrefs"
+msgstr "E694: 関数参照型には無効な操作です"
+
+#: ../eval.c:4086
 msgid "E110: Missing ')'"
 msgstr "E110: ')' がみつかりません"
 
-#: eval.c:2389
-msgid "E111: Missing ']'"
-msgstr "E111: ']' がみつかりません"
+#: ../eval.c:4193
+msgid "E695: Cannot index a Funcref"
+msgstr "E695: 関数参照型はインデックスできません"
 
-#: eval.c:2466
+#: ../eval.c:4432
 #, c-format
 msgid "E112: Option name missing: %s"
 msgstr "E112: オプション名がありません: %s"
 
-#: eval.c:2484
+#: ../eval.c:4450
 #, c-format
 msgid "E113: Unknown option: %s"
 msgstr "E113: 未知のオプションです: %s"
 
-#: eval.c:2555
+#: ../eval.c:4516
 #, c-format
 msgid "E114: Missing quote: %s"
 msgstr "E114: 引用符 (\") がありません: %s"
 
-#: eval.c:2698
+#: ../eval.c:4652
 #, c-format
 msgid "E115: Missing quote: %s"
 msgstr "E115: 引用符 (') がありません: %s"
 
-#: eval.c:3054
+#: ../eval.c:4731
 #, c-format
-msgid "E116: Invalid arguments for function %s"
-msgstr "E116: 関数 %s には無効な引数です"
+msgid "E696: Missing comma in List: %s"
+msgstr "E696: リスト型にカンマがありません: %s"
 
-#: eval.c:3083
+#: ../eval.c:4739
 #, c-format
-msgid "E117: Unknown function: %s"
-msgstr "E117: 未知の関数です: %s"
+msgid "E697: Missing end of List ']': %s"
+msgstr "E697: リスト型の最後に ']' がありません: %s"
 
-#: eval.c:3084
+#: ../eval.c:5768
 #, c-format
-msgid "E118: Too many arguments for function: %s"
-msgstr "E118: 関数の引数が多すぎます: %s"
+msgid "E720: Missing colon in Dictionary: %s"
+msgstr "E720: 辞書型にコロンがありません: %s"
+
+#: ../eval.c:5791
+msgid "E721: Duplicate key in Dictionary"
+msgstr "E721: 辞書型に重複キーがそんざいします"
 
-#: eval.c:3085
+#: ../eval.c:5811
 #, c-format
-msgid "E119: Not enough arguments for function: %s"
-msgstr "E119: 関数の引数が足りません: %s"
+msgid "E722: Missing comma in Dictionary: %s"
+msgstr "E722: 辞書型にカンマがありません: %s"
 
-#: eval.c:3086
+#: ../eval.c:5819
 #, c-format
-msgid "E120: Using <SID> not in a script context: %s"
-msgstr "E120: スクリプト以外で<SID>が使われました: %s"
+msgid "E723: Missing end of Dictionary '}': %s"
+msgstr "E723: 辞書型の最後に '}' がありません: %s"
+
+#: ../eval.c:5855
+msgid "E724: variable nested too deep for displaying"
+msgstr "E724: 表示するには変数の入れ子が深過ぎます"
+
+#: ../eval.c:7098
+msgid "E699: Too many arguments"
+msgstr "E699: が多過ぎます"
 
 #.
 #. * 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
 #. * be touched at all.  See below what 'ok' and 'ync' are used for.
 #.
-#: eval.c:3687 gui.c:4376 gui_gtk.c:2059
+#: ../eval.c:7253 ../gui.c:4390 ../gui_gtk.c:2137 ../os_mswin.c:602
 msgid "&Ok"
 msgstr "&Ok"
 
-#: eval.c:4226
+#: ../eval.c:7859
+#, c-format
+msgid "E737: Key already exists: %s"
+msgstr "E737: %s というキーは既に存在します"
+
+#: ../eval.c:8339
 #, c-format
 msgid "+-%s%3ld lines: "
 msgstr "+-%s%3ld 行:"
 
-#: eval.c:5477
+#: ../eval.c:8428
+#, c-format
+msgid "E700: Unknown function: %s"
+msgstr "E700: 未知の関数です: %s"
+
+#: ../eval.c:9966
 msgid ""
 "&OK\n"
 "&Cancel"
@@ -481,130 +643,195 @@ msgstr ""
 "決定(&O)\n"
 "キャンセル(&C)"
 
-#: eval.c:5517
+#: ../eval.c:10005
 msgid "called inputrestore() more often than inputsave()"
 msgstr "inputrestore() が inputsave() よりも多く呼ばれました"
 
-# Added at 10-Mar-2004.
-#: eval.c:5977
-msgid "E655: Too many symbolic links (cycle?)"
-msgstr "E655: シンボリックリンクが多過ぎます (循環している可能性があります)"
+#: ../eval.c:10155
+msgid "E745: Range not allowed"
+msgstr "E745: 範囲指定は許可されていません"
+
+#: ../eval.c:10358
+msgid "E701: Invalid type for len()"
+msgstr "E701: len() には無効な型です"
+
+#: ../eval.c:11090
+msgid "E726: Stride is zero"
+msgstr "E726: ストライド(前進量)が 0 です"
+
+#: ../eval.c:11092
+msgid "E727: Start past end"
+msgstr "E727: 開始位置が終了位置を越えました"
 
-#: eval.c:6609
+#: ../eval.c:11163 ../eval.c:13672
+msgid "<empty>"
+msgstr "<空>"
+
+#: ../eval.c:11287
 msgid "E240: No connection to Vim server"
 msgstr "E240: Vim サーバへの接続がありません"
 
-#: eval.c:6706
+#: ../eval.c:11333
+#, c-format
+msgid "E241: Unable to send to %s"
+msgstr "E241: %s へ送ることができません"
+
+#: ../eval.c:11465
 msgid "E277: Unable to read a server reply"
 msgstr "E277: サーバの応答がありません"
 
-#: eval.c:6734
+# Added at 10-Mar-2004.
+#: ../eval.c:11720
+msgid "E655: Too many symbolic links (cycle?)"
+msgstr "E655: シンボリックリンクが多過ぎます (循環している可能性があります)"
+
+#: ../eval.c:12144
 msgid "E258: Unable to send to client"
 msgstr "E258: クライアントへ送ることができません"
 
-#: eval.c:6782
-#, c-format
-msgid "E241: Unable to send to %s"
-msgstr "E241: %s へ送ることができません"
+#: ../eval.c:12551
+msgid "E702: Sort compare function failed"
+msgstr "E702: ソートの比較関数が失敗しました"
 
-#: eval.c:6882
+#: ../eval.c:12670
 msgid "(Invalid)"
 msgstr "(無効)"
 
-#: eval.c:8060
+#: ../eval.c:13088
+msgid "E677: Error writing temp file"
+msgstr "E677: 一時ファイル書込中にエラーが発生しました"
+
+#: ../eval.c:14421
+msgid "E703: Using a Funcref as a number"
+msgstr "E703: 関数参照型を数値として扱っています。"
+
+#: ../eval.c:14429
+msgid "E745: Using a List as a number"
+msgstr "E745: リスト型を数値として扱っています"
+
+#: ../eval.c:14432
+msgid "E728: Using a Dictionary as a number"
+msgstr "E728: 辞書型を数値として扱っています"
+
+#: ../eval.c:14490
+msgid "E729: using Funcref as a String"
+msgstr "E729: 関数参照型を文字列として扱っています"
+
+#: ../eval.c:14493
+msgid "E730: using List as a String"
+msgstr "E730: リスト型を文字列として扱っています"
+
+#: ../eval.c:14496
+msgid "E731: using Dictionary as a String"
+msgstr "E731: 変数型を文字列として扱っています"
+
+#: ../eval.c:14826
 #, c-format
-msgid "E121: Undefined variable: %s"
-msgstr "E121: 未定義の変数です: %s"
+msgid "E704: Funcref variable name must start with a capital: %s"
+msgstr "E704: 関数参照型変数名は大文字で始まらなければなりません: %s"
+
+#: ../eval.c:14831
+#, c-format
+msgid "705: Variable name conflicts with existing function: %s"
+msgstr "705: 変数名が既存の関数名と衝突します: %s"
 
-#: eval.c:8492
+#: ../eval.c:14840
 #, c-format
 msgid "E461: Illegal variable name: %s"
 msgstr "E461: 不正な変数名です: %s"
 
-#: eval.c:8784
+#: ../eval.c:14857
 #, c-format
-msgid "E122: Function %s already exists, add ! to replace it"
-msgstr "E122: 関数 %s は定義済です, 再定義するには ! を追加してください"
+msgid "E706: Variable type mismatch for: %s"
+msgstr "E706: 変数の型が一致しません: %s"
+
+#: ../eval.c:14946
+#, c-format
+msgid "E741: Value is locked: %s"
+msgstr "E741: 値がロックされています: %s"
+
+#: ../eval.c:14947 ../eval.c:14953 ../os_mswin.c:2206
+msgid "Unknown"
+msgstr "不明"
 
-#: eval.c:8857
+#: ../eval.c:14952
 #, c-format
-msgid "E123: Undefined function: %s"
-msgstr "E123: 未定義の関数です: %s"
+msgid "E742: Cannot change value of %s"
+msgstr "E742: %s の値を変更できません"
+
+#: ../eval.c:15030
+msgid "E698: variable nested too deep for making a copy"
+msgstr "E698: コピーを取るには変数の入れ子が深過ぎます"
 
-#: eval.c:8870
+#: ../eval.c:15458
 #, c-format
 msgid "E124: Missing '(': %s"
 msgstr "E124: '(' がありません: %s"
 
-#: eval.c:8903
+#: ../eval.c:15491
 #, c-format
 msgid "E125: Illegal argument: %s"
 msgstr "E125: 不正な引数です: %s"
 
-#: eval.c:8982
+#: ../eval.c:15579
 msgid "E126: Missing :endfunction"
 msgstr "E126: :endfunction がありません"
 
-#: eval.c:9089
+#: ../eval.c:15765
 #, c-format
-msgid "E127: Cannot redefine function %s: It is in use"
-msgstr "E127: 関数 %s を再定義できません: 使用中です"
+msgid "E746: Function name does not match script file name: %s"
+msgstr "E746: 関数名がスクリプトのファイル名と一致しません: %s"
 
-#: eval.c:9159
+#: ../eval.c:15878
 msgid "E129: Function name required"
 msgstr "E129: 関数名が要求されます"
 
-#: eval.c:9210
+#: ../eval.c:15963
 #, c-format
-msgid "E128: Function name must start with a capital: %s"
-msgstr "E128: 関数名は大文字で始まらなければなりません: %s"
+msgid "E128: Function name must start with a capital or contain a colon: %s"
+msgstr "E128: 関数名は大文字で始まるかコロンを含まなければなりません: %s"
 
-#: eval.c:9402
-#, c-format
-msgid "E130: Undefined function: %s"
-msgstr "E130: 未定義の関数です: %s"
-
-#: eval.c:9407
+#: ../eval.c:16441
 #, c-format
 msgid "E131: Cannot delete function %s: It is in use"
 msgstr "E131: 関数 %s を削除できません: 使用中です"
 
-#: eval.c:9455
+#: ../eval.c:16561
 msgid "E132: Function call depth is higher than 'maxfuncdepth'"
 msgstr "E132: 関数呼出の入れ子数が 'maxfuncdepth' を超えました"
 
 #. always scroll up, don't overwrite
-#: eval.c:9508
+#: ../eval.c:16691
 #, c-format
 msgid "calling %s"
 msgstr "%s を実行中です"
 
-#: eval.c:9570
+#: ../eval.c:16785
 #, c-format
 msgid "%s aborted"
 msgstr "%s が中断されました"
 
-#: eval.c:9572
+#: ../eval.c:16787
 #, c-format
 msgid "%s returning #%ld"
 msgstr "%s が #%ld を返しました"
 
-#: eval.c:9579
+#: ../eval.c:16797
 #, c-format
-msgid "%s returning \"%s\""
-msgstr "%s が \"%s\" を返しました"
+msgid "%s returning %s"
+msgstr "%s が %s を返しました"
 
 #. always scroll up, don't overwrite
-#: eval.c:9595 ex_cmds2.c:2365
+#: ../eval.c:16818 ../ex_cmds2.c:2933
 #, c-format
 msgid "continuing in %s"
 msgstr "%s の実行を継続中です"
 
-#: eval.c:9621
+#: ../eval.c:16866
 msgid "E133: :return not inside a function"
 msgstr "E133: 関数外に :return がありました"
 
-#: eval.c:9952
+#: ../eval.c:17266
 msgid ""
 "\n"
 "# global variables:\n"
@@ -612,95 +839,95 @@ msgstr ""
 "\n"
 "# グローバル変数:\n"
 
-#: ex_cmds.c:92
+#: ../ex_cmds.c:92
 #, c-format
 msgid "<%s>%s%s  %d,  Hex %02x,  Octal %03o"
 msgstr "<%s>%s%s  %d,  16進数 %02x,  8進数 %03o"
 
-#: ex_cmds.c:118
+#: ../ex_cmds.c:118
 #, c-format
 msgid "> %d, Hex %04x, Octal %o"
 msgstr "> %d, 16進数 %04x, 8進数 %o"
 
-#: ex_cmds.c:119
+#: ../ex_cmds.c:119
 #, c-format
 msgid "> %d, Hex %08x, Octal %o"
 msgstr "> %d, 16進数 %08x, 8進数 %o"
 
-#: ex_cmds.c:430
+#: ../ex_cmds.c:430
 msgid "E134: Move lines into themselves"
 msgstr "E134: 行をそれ自身には移動できません"
 
-#: ex_cmds.c:499
+#: ../ex_cmds.c:499
 msgid "1 line moved"
 msgstr "1 行が移動されました"
 
-#: ex_cmds.c:501
+#: ../ex_cmds.c:501
 #, c-format
 msgid "%ld lines moved"
 msgstr "%ld 行が移動されました"
 
-#: ex_cmds.c:924
+#: ../ex_cmds.c:977
 #, c-format
 msgid "%ld lines filtered"
 msgstr "%ld 行がフィルタ処理されました"
 
-#: ex_cmds.c:952
+#: ../ex_cmds.c:1005
 msgid "E135: *Filter* Autocommands must not change current buffer"
 msgstr "E135: *フィルタ* autocommandは現在のバッファを変更してはいけません"
 
-#: ex_cmds.c:1037
+#: ../ex_cmds.c:1090
 msgid "[No write since last change]\n"
 msgstr "[最後の変更が保存されていません]\n"
 
-#: ex_cmds.c:1283
+#: ../ex_cmds.c:1340
 #, c-format
 msgid "%sviminfo: %s in line: "
 msgstr "%sviminfo: %s 行目: "
 
-#: ex_cmds.c:1288
+#: ../ex_cmds.c:1347
 msgid "E136: viminfo: Too many errors, skipping rest of file"
 msgstr "E136: viminfo: エラーが多過ぎるので, 以降はスキップします"
 
-#: ex_cmds.c:1323
+#: ../ex_cmds.c:1382
 #, c-format
 msgid "Reading viminfo file \"%s\"%s%s%s"
 msgstr "viminfoファイル \"%s\"%s%s%s を読込み中 "
 
-#: ex_cmds.c:1324
+#: ../ex_cmds.c:1383
 msgid " info"
 msgstr " 情報"
 
-#: ex_cmds.c:1325
+#: ../ex_cmds.c:1384
 msgid " marks"
 msgstr " マーク"
 
-#: ex_cmds.c:1326
+#: ../ex_cmds.c:1385
 msgid " FAILED"
 msgstr " 失敗"
 
-#: ex_cmds.c:1418
+#: ../ex_cmds.c:1477
 #, c-format
 msgid "E137: Viminfo file is not writable: %s"
 msgstr "E137: viminfoファイルが書込みできません: %s"
 
-#: ex_cmds.c:1543
+#: ../ex_cmds.c:1602
 #, c-format
 msgid "E138: Can't write viminfo file %s!"
 msgstr "E138: viminfoファイル %s を保存できません!"
 
-#: ex_cmds.c:1551
+#: ../ex_cmds.c:1610
 #, c-format
 msgid "Writing viminfo file \"%s\""
 msgstr "viminfoファイル \"%s\" を書込み中"
 
 #. Write the info:
-#: ex_cmds.c:1649
+#: ../ex_cmds.c:1708
 #, c-format
 msgid "# This viminfo file was generated by Vim %s.\n"
 msgstr "# この viminfo ファイルは Vim %s によって生成されました.\n"
 
-#: ex_cmds.c:1651
+#: ../ex_cmds.c:1710
 msgid ""
 "# You may edit it if you're careful!\n"
 "\n"
@@ -708,47 +935,47 @@ msgstr ""
 "# 変更する際には十分注意してください!\n"
 "\n"
 
-#: ex_cmds.c:1653
+#: ../ex_cmds.c:1712
 msgid "# Value of 'encoding' when this file was written\n"
 msgstr "# このファイルが書かれた時の 'encoding' の値\n"
 
-#: ex_cmds.c:1752
+#: ../ex_cmds.c:1811
 msgid "Illegal starting char"
 msgstr "不正な先頭文字です"
 
-#: ex_cmds.c:2097 ex_cmds.c:2362 ex_cmds2.c:763
+#: ../ex_cmds.c:2176 ../ex_cmds2.c:1280
 msgid "Save As"
 msgstr "別名で保存"
 
 #. Overwriting a file that is loaded in another buffer is not a
 #. * good idea.
-#: ex_cmds.c:2140
+#: ../ex_cmds.c:2219
 msgid "E139: File is loaded in another buffer"
 msgstr "E139: 同じ名前のファイルが他のバッファで読込まれています"
 
-#: ex_cmds.c:2174
+#: ../ex_cmds.c:2253
 msgid "Write partial file?"
 msgstr "ファイルを部分的に保存しますか?"
 
-#: ex_cmds.c:2181
+#: ../ex_cmds.c:2260
 msgid "E140: Use ! to write partial buffer"
 msgstr "E140: バッファを部分的に保存するには ! を使ってください"
 
-#: ex_cmds.c:2296
+#: ../ex_cmds.c:2377
 #, c-format
 msgid "Overwrite existing file \"%.*s\"?"
 msgstr "既存のファイル \"%.*s\" を上書きしますか?"
 
-#: ex_cmds.c:2367
+#: ../ex_cmds.c:2448
 #, c-format
 msgid "E141: No file name for buffer %ld"
 msgstr "E141: バッファ %ld には名前がありません"
 
-#: ex_cmds.c:2405
+#: ../ex_cmds.c:2487
 msgid "E142: File not written: Writing is disabled by 'write' option"
 msgstr "E142: ファイルは保存されませんでした: 'write' オプションにより無効です"
 
-#: ex_cmds.c:2425
+#: ../ex_cmds.c:2507
 #, c-format
 msgid ""
 "'readonly' option is set for \"%.*s\".\n"
@@ -757,68 +984,77 @@ msgstr ""
 "\"%.*s\" には 'readonly' オプションが設定されています\n"
 "強制的に上書きしますか?"
 
-#: ex_cmds.c:2597
+#: ../ex_cmds.c:2680
 msgid "Edit File"
 msgstr "ファイルを編集"
 
-#: ex_cmds.c:3205
+#: ../ex_cmds.c:3293
 #, c-format
 msgid "E143: Autocommands unexpectedly deleted new buffer %s"
 msgstr "E143: autocommandが予期せず新しいバッファ %s を削除しました"
 
-#: ex_cmds.c:3339
+#: ../ex_cmds.c:3503
 msgid "E144: non-numeric argument to :z"
 msgstr "E144: 数ではない引数が :z に渡されました"
 
-#: ex_cmds.c:3424
+#: ../ex_cmds.c:3602
 msgid "E145: Shell commands not allowed in rvim"
 msgstr "E145: rvimではシェルコマンドを使えません"
 
-#: ex_cmds.c:3531
+#: ../ex_cmds.c:3714
 msgid "E146: Regular expressions can't be delimited by letters"
 msgstr "E146: 正規表現は文字で区切ることができません"
 
-#: ex_cmds.c:3877
+#: ../ex_cmds.c:4137
 #, c-format
 msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
 msgstr "%s に置換しますか? (y/n/a/q/l/^E/^Y)"
 
-#: ex_cmds.c:4270
+#: ../ex_cmds.c:4543
 msgid "(Interrupted) "
 msgstr "(割込まれました)"
 
-#: ex_cmds.c:4274
+#: ../ex_cmds.c:4547
+msgid "1 match"
+msgstr "1 箇所該当しました"
+
+#: ../ex_cmds.c:4547
 msgid "1 substitution"
 msgstr "1 箇所置換しました"
 
-#: ex_cmds.c:4276
+#: ../ex_cmds.c:4550
+#, c-format
+msgid "%ld matches"
+msgstr "%ld 箇所該当しました"
+
+#: ../ex_cmds.c:4550
 #, c-format
 msgid "%ld substitutions"
 msgstr "%ld 箇所置換しました"
 
-#: ex_cmds.c:4279
+#: ../ex_cmds.c:4553
 msgid " on 1 line"
 msgstr " (計 1 行内)"
 
-#: ex_cmds.c:4281
+#: ../ex_cmds.c:4555
 #, c-format
 msgid " on %ld lines"
 msgstr " (計 %ld 行内)"
 
-#: ex_cmds.c:4332
+#: ../ex_cmds.c:4606
 msgid "E147: Cannot do :global recursive"
 msgstr "E147: :global を再帰的には使えません"
 
-#: ex_cmds.c:4367
+#: ../ex_cmds.c:4641
 msgid "E148: Regular expression missing from global"
 msgstr "E148: globalコマンドに正規表現が指定されていません"
 
-#: ex_cmds.c:4416
+#: ../ex_cmds.c:4714
 #, c-format
 msgid "Pattern found in every line: %s"
 msgstr "パターンが全ての行でみつかりました: %s"
 
-#: ex_cmds.c:4497
+#: ../ex_cmds.c:4799
 msgid ""
 "\n"
 "# Last Substitute String:\n"
@@ -828,408 +1064,428 @@ msgstr ""
 "# 最後に置換された文字列:\n"
 "$"
 
-#: ex_cmds.c:4598 ex_docmd.c:2011
+#: ../ex_cmds.c:4900
 msgid "E478: Don't panic!"
 msgstr "E478: 慌てないでください"
 
-#: ex_cmds.c:4650
+#: ../ex_cmds.c:4946
 #, c-format
 msgid "E661: Sorry, no '%s' help for %s"
 msgstr "E661: 残念ですが '%s' のヘルプが %s にはありません"
 
-#: ex_cmds.c:4653
+#: ../ex_cmds.c:4949
 #, c-format
 msgid "E149: Sorry, no help for %s"
 msgstr "E149: 残念ですが %s にはヘルプがありません"
 
-#: ex_cmds.c:4687
+#: ../ex_cmds.c:4983
 #, c-format
 msgid "Sorry, help file \"%s\" not found"
 msgstr "残念ですがヘルプファイル \"%s\" がみつかりません"
 
-#: ex_cmds.c:5170
+#: ../ex_cmds.c:5533
 #, c-format
 msgid "E150: Not a directory: %s"
 msgstr "E150: ディレクトリではありません: %s"
 
-#: ex_cmds.c:5309
+#: ../ex_cmds.c:5673
 #, c-format
 msgid "E152: Cannot open %s for writing"
 msgstr "E152: 書込み用に %s を開けません"
 
-#: ex_cmds.c:5345
+#: ../ex_cmds.c:5708
 #, c-format
 msgid "E153: Unable to open %s for reading"
 msgstr "E153: 読込用に %s を開けません"
 
 # Added at 29-Apr-2004.
-#: ex_cmds.c:5367
+#: ../ex_cmds.c:5744
 #, c-format
 msgid "E670: Mix of help file encodings within a language: %s"
 msgstr "E670: 1つの言語のヘルプファイルに複数のエンコードが混在しています: %s"
 
-#: ex_cmds.c:5445
+#: ../ex_cmds.c:5822
 #, c-format
-msgid "E154: Duplicate tag \"%s\" in file %s"
-msgstr "E154: タグ \"%s\" がファイル %s に重複しています"
+msgid "E154: Duplicate tag \"%s\" in file %s/%s"
+msgstr "E154: タグ \"%s\" がファイル %s/%s に重複しています"
 
-#: ex_cmds.c:5557
+#: ../ex_cmds.c:5938
 #, c-format
 msgid "E160: Unknown sign command: %s"
 msgstr "E160: 未知のsignコマンドです: %s"
 
-#: ex_cmds.c:5577
+#: ../ex_cmds.c:5958
 msgid "E156: Missing sign name"
 msgstr "E156: sign名がありません"
 
-#: ex_cmds.c:5623
+#: ../ex_cmds.c:6004
 msgid "E612: Too many signs defined"
 msgstr "E612: signの定義が多数見つかりました"
 
-#: ex_cmds.c:5691
+#: ../ex_cmds.c:6072
 #, c-format
 msgid "E239: Invalid sign text: %s"
 msgstr "E239: 無効なsignのテキストです: %s"
 
-#: ex_cmds.c:5722 ex_cmds.c:5913
+#: ../ex_cmds.c:6103 ../ex_cmds.c:6294
 #, c-format
 msgid "E155: Unknown sign: %s"
 msgstr "E155: 未知のsignです: %s"
 
-#: ex_cmds.c:5771
+#: ../ex_cmds.c:6152
 msgid "E159: Missing sign number"
 msgstr "E159: signの番号がありません"
 
-#: ex_cmds.c:5853
+#: ../ex_cmds.c:6234
 #, c-format
 msgid "E158: Invalid buffer name: %s"
 msgstr "E158: 無効なバッファ名です: %s"
 
-#: ex_cmds.c:5892
+#: ../ex_cmds.c:6273
 #, c-format
 msgid "E157: Invalid sign ID: %ld"
 msgstr "E157: 無効なsign識別子です: %ld"
 
 # Added at 27-Jan-2004.
-#: ex_cmds.c:5962
+#: ../ex_cmds.c:6343
 msgid " (NOT FOUND)"
 msgstr "  (みつかりません)"
 
-#: ex_cmds.c:5964
+#: ../ex_cmds.c:6345
 msgid " (not supported)"
 msgstr " (非サポート)"
 
-#: ex_cmds.c:6063
+#: ../ex_cmds.c:6444
 msgid "[Deleted]"
 msgstr "[削除済]"
 
-#: ex_cmds2.c:92
+#: ../ex_cmds2.c:140
 msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "デバッグモードに入ります. 続けるには \"cont\" と入力してください."
 
-#: ex_cmds2.c:96 ex_docmd.c:966
+#: ../ex_cmds2.c:144 ../ex_docmd.c:1063
 #, c-format
 msgid "line %ld: %s"
 msgstr "行 %ld: %s"
 
-#: ex_cmds2.c:98
+#: ../ex_cmds2.c:146
 #, c-format
 msgid "cmd: %s"
 msgstr "コマンド: %s"
 
-#: ex_cmds2.c:290
+#: ../ex_cmds2.c:338
 #, c-format
 msgid "Breakpoint in \"%s%s\" line %ld"
 msgstr "ブレークポイント \"%s%s\" 行 %ld"
 
-#: ex_cmds2.c:540
+#: ../ex_cmds2.c:640
 #, c-format
 msgid "E161: Breakpoint not found: %s"
 msgstr "E161: ブレークポイントがみつかりません: %s"
 
-#: ex_cmds2.c:566
+#: ../ex_cmds2.c:665
 msgid "No breakpoints defined"
 msgstr "ブレークポイントが定義されていません"
 
-#: ex_cmds2.c:571
+#: ../ex_cmds2.c:670
 #, c-format
 msgid "%3d  %s %s  line %ld"
 msgstr "%3d  %s %s  行 %ld"
 
-#: ex_cmds2.c:786
+#: ../ex_cmds2.c:990
+msgid "E750: First use :profile start <fname>"
+msgstr "E750: 初めに :profile start <fname> を実行してください"
+
+#: ../ex_cmds2.c:1305
 #, c-format
 msgid "Save changes to \"%.*s\"?"
 msgstr "変更を \"%.*s\" に保存しますか?"
 
-#: ex_cmds2.c:788 ex_docmd.c:9356
+#: ../ex_cmds2.c:1307 ../ex_docmd.c:9919
 msgid "Untitled"
 msgstr "無題"
 
-#: ex_cmds2.c:915
+#: ../ex_cmds2.c:1434
 #, c-format
 msgid "E162: No write since last change for buffer \"%s\""
 msgstr "E162: バッファ \"%s\" の変更は保存されていません"
 
-#: ex_cmds2.c:984
+#: ../ex_cmds2.c:1505
 msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
 msgstr "警告: 予期せず他バッファへ移動しました (autocommands を調べてください)"
 
-#: ex_cmds2.c:1387
+#: ../ex_cmds2.c:1924
 msgid "E163: There is only one file to edit"
 msgstr "E163: 編集するファイルは1つしかありません"
 
-#: ex_cmds2.c:1389
+#: ../ex_cmds2.c:1926
 msgid "E164: Cannot go before first file"
 msgstr "E164: 最初のファイルより前には行けません"
 
-#: ex_cmds2.c:1391
+#: ../ex_cmds2.c:1928
 msgid "E165: Cannot go beyond last file"
 msgstr "E165: 最後のファイルを越えて後には行けません"
 
-#: ex_cmds2.c:1804
+#: ../ex_cmds2.c:2341
 #, c-format
 msgid "E666: compiler not supported: %s"
 msgstr "E666: そのコンパイラには対応していません: %s"
 
-#: ex_cmds2.c:1897
+#: ../ex_cmds2.c:2438
 #, c-format
 msgid "Searching for \"%s\" in \"%s\""
 msgstr "\"%s\" を \"%s\" から検索中"
 
-#: ex_cmds2.c:1919
+#: ../ex_cmds2.c:2460
 #, c-format
 msgid "Searching for \"%s\""
 msgstr "\"%s\" を検索中"
 
-#: ex_cmds2.c:1940
+#: ../ex_cmds2.c:2482
 #, c-format
 msgid "not found in 'runtimepath': \"%s\""
 msgstr "'runtimepath' の中にはみつかりません: \"%s\""
 
-#: ex_cmds2.c:1974
+#: ../ex_cmds2.c:2516
 msgid "Source Vim script"
 msgstr "Vimスクリプトの取込み"
 
-#: ex_cmds2.c:2164
+#: ../ex_cmds2.c:2692
 #, c-format
 msgid "Cannot source a directory: \"%s\""
 msgstr "ディレクトリは取込めません: \"%s\""
 
-#: ex_cmds2.c:2202
+#: ../ex_cmds2.c:2730
 #, c-format
 msgid "could not source \"%s\""
 msgstr "\"%s\" を取込めません"
 
-#: ex_cmds2.c:2204
+#: ../ex_cmds2.c:2732
 #, c-format
 msgid "line %ld: could not source \"%s\""
 msgstr "行 %ld: \"%s\" を取込めません"
 
-#: ex_cmds2.c:2218
+#: ../ex_cmds2.c:2746
 #, c-format
 msgid "sourcing \"%s\""
 msgstr "\"%s\" を取込中"
 
-#: ex_cmds2.c:2220
+#: ../ex_cmds2.c:2748
 #, c-format
 msgid "line %ld: sourcing \"%s\""
 msgstr "行 %ld: %s を取込中"
 
-#: ex_cmds2.c:2363
+#: ../ex_cmds2.c:2931
 #, c-format
 msgid "finished sourcing %s"
 msgstr "%s の取込を完了"
 
-#: ex_cmds2.c:2707
+#: ../ex_cmds2.c:3301
 msgid "W15: Warning: Wrong line separator, ^M may be missing"
 msgstr "W15: 警告: 行区切が不正です. ^M がないのでしょう"
 
-#: ex_cmds2.c:2756
+#: ../ex_cmds2.c:3435
 msgid "E167: :scriptencoding used outside of a sourced file"
 msgstr "E167: :scriptencoding が取込スクリプト以外で使用されました"
 
-#: ex_cmds2.c:2789
+#: ../ex_cmds2.c:3468
 msgid "E168: :finish used outside of a sourced file"
 msgstr "E168: :finish が取込スクリプト以外で使用されました"
 
-#: ex_cmds2.c:3238
+#: ../ex_cmds2.c:3917
 #, c-format
 msgid "Page %d"
 msgstr "%d ページ"
 
-#: ex_cmds2.c:3394
+#: ../ex_cmds2.c:4073
 msgid "No text to be printed"
 msgstr "印刷するテキストがありません"
 
-#: ex_cmds2.c:3472
+#: ../ex_cmds2.c:4151
 msgid "Printing page %d (%d%%)"
 msgstr "印刷中: ページ %d (%d%%)"
 
-#: ex_cmds2.c:3484
+#: ../ex_cmds2.c:4163
 #, c-format
 msgid " Copy %d of %d"
 msgstr " コピー %d (全 %d 中)"
 
-#: ex_cmds2.c:3542
+#: ../ex_cmds2.c:4221
 #, c-format
 msgid "Printed: %s"
 msgstr "印刷しました: %s"
 
-#: ex_cmds2.c:3549
+#: ../ex_cmds2.c:4228
 msgid "Printing aborted"
 msgstr "印刷が中止されました"
 
-#: ex_cmds2.c:3914
+#: ../ex_cmds2.c:4882
 msgid "E455: Error writing to PostScript output file"
 msgstr "E455: PostScript出力ファイルの書込みエラーです"
 
-#: ex_cmds2.c:4189
+#: ../ex_cmds2.c:5342
 #, c-format
 msgid "E624: Can't open file \"%s\""
 msgstr "E624: ファイル \"%s\" を開けません"
 
-#: ex_cmds2.c:4199 ex_cmds2.c:4824
+#: ../ex_cmds2.c:5352 ../ex_cmds2.c:6226
 #, c-format
 msgid "E457: Can't read PostScript resource file \"%s\""
 msgstr "E457: PostScriptのリソースファイル \"%s\" を読込めません"
 
-#: ex_cmds2.c:4207
+#: ../ex_cmds2.c:5368
 #, c-format
 msgid "E618: file \"%s\" is not a PostScript resource file"
 msgstr "E618: ファイル \"%s\" は PostScript リソースファイルではありません"
 
-#: ex_cmds2.c:4222 ex_cmds2.c:4242 ex_cmds2.c:4257 ex_cmds2.c:4279
+#: ../ex_cmds2.c:5386 ../ex_cmds2.c:5405 ../ex_cmds2.c:5450
 #, c-format
 msgid "E619: file \"%s\" is not a supported PostScript resource file"
 msgstr "E619: ファイル \"%s\" は対応していない PostScript リソースファイルです"
 
-#: ex_cmds2.c:4309
+#: ../ex_cmds2.c:5469
 #, c-format
 msgid "E621: \"%s\" resource file has wrong version"
 msgstr "E621: リソースファイル \"%s\" はバージョンが異なります"
 
-#: ex_cmds2.c:4776
+#: ../ex_cmds2.c:5947
+msgid "E673: Incompatible multi-byte encoding and character set."
+msgstr "E673: 互換性の無いマルチバイトエンコーディングと文字セットです"
+
+#: ../ex_cmds2.c:5964
+msgid "E674: printmbcharset cannot be empty with multi-byte encoding."
+msgstr "E674: マルチバイトエンコーディングでは printmbcharset を空にできません"
+
+#: ../ex_cmds2.c:5982
+msgid "E675: No default font specfifed for multi-byte printing."
+msgstr ""
+"E675: マルチバイト文字を印刷するためのデフォルトフォントが指定されていません"
+
+#: ../ex_cmds2.c:6175
 msgid "E324: Can't open PostScript output file"
 msgstr "E324: PostScript出力用のファイルを開けません"
 
-#: ex_cmds2.c:4809
+#: ../ex_cmds2.c:6212
 #, c-format
 msgid "E456: Can't open file \"%s\""
 msgstr "E456: ファイル \"%s\" を開けません"
 
-#: ex_cmds2.c:4928
+#: ../ex_cmds2.c:6343
 msgid "E456: Can't find PostScript resource file \"prolog.ps\""
 msgstr "E456: PostScriptのリソースファイル \"prolog.ps\" がみつかりません"
 
-#: ex_cmds2.c:4959
+#: ../ex_cmds2.c:6356
+msgid "E456: Can't find PostScript resource file \"cidfont.ps\""
+msgstr "E456: PostScriptのリソースファイル \"cidfont.ps\" がみつかりません"
+
+#: ../ex_cmds2.c:6394 ../ex_cmds2.c:6416 ../ex_cmds2.c:6445
 #, c-format
 msgid "E456: Can't find PostScript resource file \"%s.ps\""
 msgstr "E456: PostScriptのリソースファイル \"%s.ps\" がみつかりません"
 
-#: ex_cmds2.c:4977
+#: ../ex_cmds2.c:6432
 #, c-format
-msgid "E620: Unable to convert from multi-byte to \"%s\" encoding"
-msgstr "E620: マルチバイト文字をエンコード \"%s\" へ変換できません"
+msgid "E620: Unable to convert to print encoding \"%s\""
+msgstr "E620: 印刷エンコード \"%s\" へ変換できません"
 
-#: ex_cmds2.c:5102
+#: ../ex_cmds2.c:6686
 msgid "Sending to printer..."
 msgstr "プリンタに送信中..."
 
-#: ex_cmds2.c:5106
+#: ../ex_cmds2.c:6690
 msgid "E365: Failed to print PostScript file"
 msgstr "E365: PostScriptファイルの印刷に失敗しました"
 
-#: ex_cmds2.c:5108
+#: ../ex_cmds2.c:6692
 msgid "Print job sent."
 msgstr "印刷ジョブを送信しました."
 
-#: ex_cmds2.c:5618
+#: ../ex_cmds2.c:7299
 #, c-format
 msgid "Current %slanguage: \"%s\""
 msgstr "現在の %s言語: \"%s\""
 
-#: ex_cmds2.c:5629
+#: ../ex_cmds2.c:7310
 #, c-format
 msgid "E197: Cannot set language to \"%s\""
 msgstr "E197: 言語を \"%s\" に設定できません"
 
-#: ex_docmd.c:525
+#: ../ex_docmd.c:604
 msgid "Entering Ex mode.  Type \"visual\" to go to Normal mode."
 msgstr "Exモードに入ります. ノーマルに戻るには\"visual\"と入力してください."
 
-#. must be at EOF
-#: ex_docmd.c:561
+#: ../ex_docmd.c:659
 msgid "E501: At end-of-file"
 msgstr "E501: ファイルの終了位置"
 
-#: ex_docmd.c:669
+#: ../ex_docmd.c:758
 msgid "E169: Command too recursive"
 msgstr "E169: コマンドが再帰的過ぎます"
 
-#: ex_docmd.c:1229
+#: ../ex_docmd.c:1340
 #, c-format
 msgid "E605: Exception not caught: %s"
 msgstr "E605: 例外が捕捉されませんでした: %s"
 
-#: ex_docmd.c:1317
+#: ../ex_docmd.c:1428
 msgid "End of sourced file"
 msgstr "取込ファイルの最後です"
 
-#: ex_docmd.c:1318
+#: ../ex_docmd.c:1429
 msgid "End of function"
 msgstr "関数の最後です"
 
-#: ex_docmd.c:1907
+#: ../ex_docmd.c:2031
 msgid "E464: Ambiguous use of user-defined command"
 msgstr "E464: ユーザ定義コマンドのあいまいな使用です"
 
-#: ex_docmd.c:1921
+#: ../ex_docmd.c:2045
 msgid "E492: Not an editor command"
 msgstr "E492: エディタのコマンドではありません"
 
-#: ex_docmd.c:2030
+#: ../ex_docmd.c:2152
 msgid "E493: Backwards range given"
 msgstr "E493: 逆さまの範囲が指定されました"
 
-#: ex_docmd.c:2039
+#: ../ex_docmd.c:2161
 msgid "Backwards range given, OK to swap"
 msgstr "逆さまの範囲が指定されました, 入替えますか?"
 
-#: ex_docmd.c:2162
+#: ../ex_docmd.c:2286
 msgid "E494: Use w or w>>"
 msgstr "E494: w もしくは w>> を使用してください"
 
-#: ex_docmd.c:3788
+#: ../ex_docmd.c:3974
 msgid "E319: Sorry, the command is not available in this version"
 msgstr "E319: このバージョンではこのコマンドは利用できません, ごめんなさい"
 
-#: ex_docmd.c:3991
+#: ../ex_docmd.c:4229
 msgid "E172: Only one file name allowed"
 msgstr "E172: ファイル名は 1 つにしてください"
 
-#: ex_docmd.c:4571
+#: ../ex_docmd.c:4817
 msgid "1 more file to edit.  Quit anyway?"
 msgstr "編集すべきファイルが 1 個ありますが, 終了しますか?"
 
-#: ex_docmd.c:4574
+#: ../ex_docmd.c:4820
 #, c-format
 msgid "%d more files to edit.  Quit anyway?"
 msgstr "編集すべきファイルがあと %d 個ありますが, 終了しますか?"
 
-#: ex_docmd.c:4581
+#: ../ex_docmd.c:4827
 msgid "E173: 1 more file to edit"
 msgstr "E173: 編集すべきファイルが 1 個あります"
 
-#: ex_docmd.c:4583
+#: ../ex_docmd.c:4829
 #, c-format
 msgid "E173: %ld more f