Ken Takata avatar Ken Takata committed a7691e9

add patches for Cygwin and Linux

Comments (0)

Files changed (13)

+^\.hg
+^\.mq
+syntax: glob
+status
+guards

backout-7.3.638.patch

+# HG changeset patch
+# Parent ccd9c9c2687e467c2bd45752e297b8aa9836e45d
+
+diff --git a/src/screen.c b/src/screen.c
+--- a/src/screen.c
++++ b/src/screen.c
+@@ -5345,9 +5345,8 @@
+ 		    && (ScreenLinesUC[off_from] != ScreenLinesUC[off_to]
+ 			|| (ScreenLinesUC[off_from] != 0
+ 			    && comp_char_differs(off_from, off_to))
+-			|| ((*mb_off2cells)(off_from, off_from + cols) > 1
+-			    && ScreenLines[off_from + 1]
+-						  != ScreenLines[off_to + 1])))
++			|| (cols > 1 && ScreenLines[off_from + 1]
++						 != ScreenLines[off_to + 1])))
+ #endif
+ 	       ))
+ 	return TRUE;
+diff --git a/src/version.c b/src/version.c
+--- a/src/version.c
++++ b/src/version.c
+@@ -958,8 +958,6 @@
+ /**/
+     639,
+ /**/
+-    638,
+-/**/
+     637,
+ /**/
+     636,
+# HG changeset patch
+# Parent 44201c9426d97639f351349b5e864fd8aa81cd76
+
+diff --git a/src/auto/configure b/src/auto/configure
+--- a/src/auto/configure
++++ b/src/auto/configure
+@@ -5117,6 +5117,7 @@
+       ldflags_save=$LDFLAGS
+       CFLAGS="$CFLAGS $perlcppflags"
+       LIBS="$LIBS $perllibs"
++      perlldflags=`echo "$perlldflags" | sed -e 's/^ *//g'`
+       LDFLAGS="$perlldflags $LDFLAGS"
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+@@ -5146,7 +5147,9 @@
+ 	  	  PERL_CFLAGS=`echo "$perlcppflags" | sed -e 's/-pipe //' -e 's/-W[^ ]*//'`
+ 	fi
+ 	if test "X$perlldflags" != "X"; then
+-	  LDFLAGS="$perlldflags $LDFLAGS"
++	  if test "X`echo \"$LDFLAGS\" | grep -F -e \"$perlldflags\"`" = "X"; then
++	    LDFLAGS="$perlldflags $LDFLAGS"
++	  fi
+ 	fi
+ 	PERL_LIBS=$perllibs
+ 	PERL_SRC="auto/if_perl.c if_perlsfio.c"
+@@ -6392,13 +6395,13 @@
+ 	fi
+ 	librubyarg=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG['LIBRUBYARG'])"`
+ 	librubya=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG['LIBRUBY_A'])"`
+-  rubylibdir=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG['libdir'])"`
++	rubylibdir=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG['libdir'])"`
+ 	if test -f "$rubylibdir/$librubya"; then
+ 	  librubyarg="$librubyarg"
+-    RUBY_LIBS="$RUBY_LIBS -L$rubylibdir"
+-  elif test "$librubyarg" = "libruby.a"; then
+-        librubyarg="-lruby"
+-    RUBY_LIBS="$RUBY_LIBS -L$rubylibdir"
++	  RUBY_LIBS="$RUBY_LIBS -L$rubylibdir"
++	elif test "$librubyarg" = "libruby.a"; then
++	  	  librubyarg="-lruby"
++	  RUBY_LIBS="$RUBY_LIBS -L$rubylibdir"
+ 	fi
+ 
+ 	if test "X$librubyarg" != "X"; then
+@@ -6408,7 +6411,9 @@
+ 	if test "X$rubyldflags" != "X"; then
+ 	  	  	  	  rubyldflags=`echo "$rubyldflags" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//' -e 's/-arch\ x86_64//'`
+ 	  if test "X$rubyldflags" != "X"; then
+-	    LDFLAGS="$rubyldflags $LDFLAGS"
++	    if test "X`echo \"$LDFLAGS\" | grep -F -e \"$rubyldflags\"`" = "X"; then
++	      LDFLAGS="$rubyldflags $LDFLAGS"
++	    fi
+ 	  fi
+ 	fi
+ 	RUBY_SRC="if_ruby.c"
+@@ -12617,7 +12622,7 @@
+           { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need -D_FORTIFY_SOURCE=1" >&5
+ $as_echo_n "checking whether we need -D_FORTIFY_SOURCE=1... " >&6; }
+   if test "$gccmajor" -gt "3"; then
+-    CFLAGS=`echo "$CFLAGS" | sed -e 's/-Wp,-D_FORTIFY_SOURCE=.//g' -e 's/-D_FORTIFY_SOURCE=.//g' -e 's/$/ -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1/'`
++    CFLAGS=`echo "$CFLAGS" | sed -e 's/ *-Wp,-D_FORTIFY_SOURCE=.//g' -e 's/ *-D_FORTIFY_SOURCE=.//g' -e 's/ *-U_FORTIFY_SOURCE//g' -e 's/$/ -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1/'`
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+   else
+@@ -12632,7 +12637,7 @@
+ LINK_AS_NEEDED=
+ # Check if linker supports --as-needed and --no-as-needed options
+ if $CC -Wl,--help 2>/dev/null | grep as-needed > /dev/null; then
+-  LDFLAGS="$LDFLAGS -Wl,--as-needed"
++  LDFLAGS=`echo "$LDFLAGS" | sed -e 's/ *-Wl,--as-needed//g' | sed -e 's/$/ -Wl,--as-needed/'`
+   LINK_AS_NEEDED=yes
+ fi
+ if test "$LINK_AS_NEEDED" = yes; then

fix-indent-in-configure.in.patch

+# HG changeset patch
+# Parent c9662ddae72ddc8c4bc381df4db6dc4e32c07adb
+diff --git a/src/configure.in b/src/configure.in
+--- a/src/configure.in
++++ b/src/configure.in
+@@ -1486,14 +1486,14 @@
+ 	fi
+ 	librubyarg=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG[['LIBRUBYARG']])"`
+ 	librubya=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG[['LIBRUBY_A']])"`
+-  rubylibdir=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG[['libdir']])"`
++	rubylibdir=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG[['libdir']])"`
+ 	if test -f "$rubylibdir/$librubya"; then
+ 	  librubyarg="$librubyarg"
+-    RUBY_LIBS="$RUBY_LIBS -L$rubylibdir"
+-  elif test "$librubyarg" = "libruby.a"; then
+-    dnl required on Mac OS 10.3 where libruby.a doesn't exist
+-    librubyarg="-lruby"
+-    RUBY_LIBS="$RUBY_LIBS -L$rubylibdir"
++	  RUBY_LIBS="$RUBY_LIBS -L$rubylibdir"
++	elif test "$librubyarg" = "libruby.a"; then
++	  dnl required on Mac OS 10.3 where libruby.a doesn't exist
++	  librubyarg="-lruby"
++	  RUBY_LIBS="$RUBY_LIBS -L$rubylibdir"
+ 	fi
+ 
+ 	if test "X$librubyarg" != "X"; then

fix-make-config.patch

+# HG changeset patch
+# Parent 81914f94dd1d2330ba87fdf69852d5a421312bfd
+
+diff --git a/src/Makefile b/src/Makefile
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -1650,10 +1650,15 @@
+ # doesn't always update auto/config.h.  The timestamp isn't changed if the
+ # file contents didn't change (to avoid recompiling everything).  Including a
+ # dependency on auto/config.h would cause running configure each time when
+-# auto/config.h isn't updated.  The dependency on auto/config.mk should make
+-# sure configure is run when it's needed.
++# auto/config.h isn't updated.  The dependency on auto/config.status should
++# make sure configure is run when it's needed.
+ #
+-config auto/config.mk: auto/configure config.mk.in config.h.in
++config auto/config.status: auto/configure config.mk.in config.h.in
++	if test -f auto/config.cache; then \
++		if grep '^ac_cv_env_CC_value=$$' auto/config.cache > /dev/null; then \
++			rm auto/config.cache; \
++		fi \
++	fi
+ 	GUI_INC_LOC="$(GUI_INC_LOC)" GUI_LIB_LOC="$(GUI_LIB_LOC)" \
+ 		CC="$(CC)" CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" \
+ 		LDFLAGS="$(LDFLAGS)" $(CONF_SHELL) srcdir="$(srcdir)" \
+@@ -1717,7 +1722,7 @@
+ 
+ # Link the target for normal use or debugging.
+ # A shell script is used to try linking without unneccesary libraries.
+-$(VIMTARGET): auto/config.mk objects $(OBJ) version.c version.h
++$(VIMTARGET): auto/config.status objects $(OBJ) version.c version.h
+ 	$(CCC) version.c -o objects/version.o
+ 	@LINK="$(PURIFY) $(SHRPENV) $(CClink) $(ALL_LIB_DIRS) $(LDFLAGS) \
+ 		-o $(VIMTARGET) $(OBJ) $(ALL_LIBS)" \
+@@ -2363,6 +2368,9 @@
+ 	touch auto/config.h
+ 	cp config.mk.dist auto/config.mk
+ 
++auto/config.mk:
++	cp config.mk.dist auto/config.mk
++
+ distclean: clean scratch
+ 	-rm -f tags
+ 
+diff --git a/src/configure.in b/src/configure.in
+--- a/src/configure.in
++++ b/src/configure.in
+@@ -760,6 +760,7 @@
+       ldflags_save=$LDFLAGS
+       CFLAGS="$CFLAGS $perlcppflags"
+       LIBS="$LIBS $perllibs"
++      perlldflags=`echo "$perlldflags" | sed -e 's/^ *//g'`
+       LDFLAGS="$perlldflags $LDFLAGS"
+       AC_TRY_LINK(,[ ],
+ 	     AC_MSG_RESULT(yes); perl_ok=yes,
+@@ -773,7 +774,9 @@
+ 	  PERL_CFLAGS=`echo "$perlcppflags" | sed -e 's/-pipe //' -e 's/-W[[^ ]]*//'`
+ 	fi
+ 	if test "X$perlldflags" != "X"; then
+-	  LDFLAGS="$perlldflags $LDFLAGS"
++	  if test "X`echo \"$LDFLAGS\" | grep -F -e \"$perlldflags\"`" = "X"; then
++	    LDFLAGS="$perlldflags $LDFLAGS"
++	  fi
+ 	fi
+ 	PERL_LIBS=$perllibs
+ 	PERL_SRC="auto/if_perl.c if_perlsfio.c"
+@@ -1502,7 +1505,9 @@
+ 	  dnl configure, so strip these flags first (if present)
+ 	  rubyldflags=`echo "$rubyldflags" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//' -e 's/-arch\ x86_64//'`
+ 	  if test "X$rubyldflags" != "X"; then
+-	    LDFLAGS="$rubyldflags $LDFLAGS"
++	    if test "X`echo \"$LDFLAGS\" | grep -F -e \"$rubyldflags\"`" = "X"; then
++	      LDFLAGS="$rubyldflags $LDFLAGS"
++	    fi
+ 	  fi
+ 	fi
+ 	RUBY_SRC="if_ruby.c"
+@@ -3651,7 +3656,7 @@
+   dnl And undefine it first to avoid a warning.
+   AC_MSG_CHECKING(whether we need -D_FORTIFY_SOURCE=1)
+   if test "$gccmajor" -gt "3"; then
+-    CFLAGS=`echo "$CFLAGS" | sed -e 's/-Wp,-D_FORTIFY_SOURCE=.//g' -e 's/-D_FORTIFY_SOURCE=.//g' -e 's/$/ -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1/'`
++    CFLAGS=`echo "$CFLAGS" | sed -e 's/ *-Wp,-D_FORTIFY_SOURCE=.//g' -e 's/ *-D_FORTIFY_SOURCE=.//g' -e 's/ *-U_FORTIFY_SOURCE//g' -e 's/$/ -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1/'`
+     AC_MSG_RESULT(yes)
+   else
+     AC_MSG_RESULT(no)
+@@ -3666,7 +3671,7 @@
+ LINK_AS_NEEDED=
+ # Check if linker supports --as-needed and --no-as-needed options
+ if $CC -Wl,--help 2>/dev/null | grep as-needed > /dev/null; then
+-  LDFLAGS="$LDFLAGS -Wl,--as-needed"
++  LDFLAGS=`echo "$LDFLAGS" | sed -e 's/ *-Wl,--as-needed//g' | sed -e 's/$/ -Wl,--as-needed/'`
+   LINK_AS_NEEDED=yes
+ fi
+ if test "$LINK_AS_NEEDED" = yes; then

fix-typo-in-todo.txt.patch

+# HG changeset patch
+# Parent cad82ddac1d4d7d77ac58a4068e3f427afe8223a
+diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
+--- a/runtime/doc/todo.txt
++++ b/runtime/doc/todo.txt
+@@ -260,7 +260,7 @@
+ 
+ Patch to add ":py3do". (Lilydjwg, 2012 Apr 7)
+ 
+-`[ moves to character after insert, instead of the last inserted character.
++`] moves to character after insert, instead of the last inserted character.
+ (Yukihiro Nakadaira, 2011 Dec 9)
+ 
+ Plugin for Modeleasy. (Massimiliano Tripoli, 2011 Nov 29)
+@@ -714,7 +714,7 @@
+ Patch for displaying 0x200c and 0x200d. (Ali Gholami Rudi, 2009 May 6)
+ Probably needs a bit of work.
+ 
+-List of encoding aliases. (Takao Fujiware, 2009 Jul 18)
++List of encoding aliases. (Takao Fujiwara, 2009 Jul 18)
+ Are they all OK?  Update Jul 22.
+ 
+ Win32: Improved Makefile for MSVC. (Leonardo Valeri Manera, 2010 Aug 18)
+@@ -744,7 +744,7 @@
+ When starting Vim with "gvim -f -u non_existent_file > foo.txt" there are a
+ few control characters in the output. (Dale Wiles, 2009 May 28)
+ 
+-'cmdwinheight is only used in last window when 'winheight' is a large value.
++'cmdwinheight' is only used in last window when 'winheight' is a large value.
+ (Tony Mechelynck, 2009 Apr 15)
+ 
+ Status line containing winnr() isn't updated when splitting the window (Clark

myconfiguration-for-cygwin.patch

+# HG changeset patch
+# Parent 3bc0838d318836f4dde9ebd06e65fc2ed54ad97c
+
+diff --git a/src/Makefile b/src/Makefile
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -377,7 +377,7 @@
+ # Uncomment one of these when you want to include the Lua interface.
+ # First one is for static linking, second one for dynamic loading.
+ #CONF_OPT_LUA = --enable-luainterp
+-#CONF_OPT_LUA = --enable-luainterp=dynamic
++CONF_OPT_LUA = --enable-luainterp=dynamic
+ # Lua installation dir (when not set uses $LUA_PREFIX or defaults to /usr)
+ #CONF_OPT_LUA_PREFIX = --with-lua-prefix=/usr/local
+ 
+@@ -406,7 +406,7 @@
+ # one: "touch perl.exp".
+ # This requires at least "small" features, "tiny" doesn't work.
+ #CONF_OPT_PERL = --enable-perlinterp
+-#CONF_OPT_PERL = --enable-perlinterp=dynamic
++CONF_OPT_PERL = --enable-perlinterp=dynamic
+ 
+ # PYTHON
+ # Uncomment this when you want to include the Python interface.
+@@ -420,16 +420,16 @@
+ # However, this may still cause problems, such as "import termios" failing.
+ # Build two separate versions of Vim in that case.
+ #CONF_OPT_PYTHON = --enable-pythoninterp
+-#CONF_OPT_PYTHON = --enable-pythoninterp=dynamic
++CONF_OPT_PYTHON = --enable-pythoninterp=dynamic
+ #CONF_OPT_PYTHON3 = --enable-python3interp
+-#CONF_OPT_PYTHON3 = --enable-python3interp=dynamic
++CONF_OPT_PYTHON3 = --enable-python3interp=dynamic
+ 
+ # RUBY
+ # Uncomment this when you want to include the Ruby interface.
+ # First one for static linking, second one for loading when used.
+ # Note: you need the development package (e.g., ruby1.9.1-dev on Ubuntu).
+ #CONF_OPT_RUBY = --enable-rubyinterp
+-#CONF_OPT_RUBY = --enable-rubyinterp=dynamic
++CONF_OPT_RUBY = --enable-rubyinterp=dynamic
+ #CONF_OPT_RUBY = --enable-rubyinterp --with-ruby-command=ruby1.9.1
+ 
+ # TCL
+@@ -498,7 +498,7 @@
+ #CONF_OPT_FEAT = --with-features=small
+ #CONF_OPT_FEAT = --with-features=normal
+ #CONF_OPT_FEAT = --with-features=big
+-#CONF_OPT_FEAT = --with-features=huge
++CONF_OPT_FEAT = --with-features=huge
+ 
+ # COMPILED BY - For including a specific e-mail address for ":version".
+ #CONF_OPT_COMPBY = "--with-compiledby=John Doe <JohnDoe@yahoo.com>"
+@@ -915,6 +915,7 @@
+ #
+ # Uncomment the next line to install Vim in your home directory.
+ #prefix = $(HOME)
++prefix = /usr
+ 
+ ### exec_prefix	is the top directory for the executable (default $(prefix))
+ #
+myconfiguration-for-cygwin.patch
+fix-make-config.patch
+fix-indent-in-configure.in.patch
+configure.patch
+fix-typo-in-todo.txt.patch
+version_acl_xpm.patch
+update-ja.po.patch
+update-menu_ja.patch
+backout-7.3.638.patch
+vim_on_cygwin_using_win32_clipboard__simple__7.3.785.patch
+vim_on_cygwin_using_win32_clipboard__full__7.3.785.patch

update-ja.po.patch

+# HG changeset patch
+# Parent e0ab12837ea14c55c28de50544b4b1f57fb99512
+
+diff --git a/src/po/ja.po b/src/po/ja.po
+--- a/src/po/ja.po
++++ b/src/po/ja.po
+@@ -3,7 +3,7 @@
+ # Do ":help uganda"  in Vim to read copying and usage conditions.
+ # Do ":help credits" in Vim to see a list of people who contributed.
+ #
+-# Last Change: 15-Jun-2012.
++# Last Change: 29-Dec-2012.
+ #
+ # Copyright (C) 2001-12 MURAOKA Taro <koron.kaoriya@gmail.com>
+ # THIS FILE IS DISTRIBUTED UNDER THE VIM LICENSE.
+@@ -109,7 +109,7 @@
+ 
+ #, c-format
+ msgid "E92: Buffer %ld not found"
+-msgstr "E92: �Хåե� %ld ���ߤĤ���ޤ���"
++msgstr "E92: �Хåե� %ld �����Ĥ���ޤ���"
+ 
+ #, c-format
+ msgid "E93: More than one match for %s"
+@@ -234,7 +234,7 @@
+ 
+ #, c-format
+ msgid "E102: Can't find buffer \"%s\""
+-msgstr "E102: �Хåե� \"%s\" ���ߤĤ���ޤ���"
++msgstr "E102: �Хåե� \"%s\" �����Ĥ���ޤ���"
+ 
+ #, c-format
+ msgid "E103: Buffer \"%s\" is not in diff mode"
+@@ -247,7 +247,7 @@
+ msgstr "E104: �����Escape�ϻ��ѤǤ��ޤ���"
+ 
+ msgid "E544: Keymap file not found"
+-msgstr "E544: �����ޥåץե����뤬�ߤĤ���ޤ���"
++msgstr "E544: �����ޥåץե����뤬���Ĥ���ޤ���"
+ 
+ msgid "E105: Using :loadkeymap not in a sourced file"
+ msgstr "E105: :source �Ǽ����ե�����ʳ��Ǥ� :loadkeymap ��Ȥ��ޤ���"
+@@ -369,7 +369,7 @@
+ msgstr "E121: ̤������ѿ�Ǥ�: %s"
+ 
+ msgid "E111: Missing ']'"
+-msgstr "E111: ']' ���ߤĤ���ޤ���"
++msgstr "E111: ']' �����Ĥ���ޤ���"
+ 
+ #, c-format
+ msgid "E686: Argument of %s must be a List"
+@@ -489,7 +489,7 @@
+ msgstr "E804: '%' ����ư����������Ȥ߹�碌�ƤϻȤ��ޤ���"
+ 
+ msgid "E110: Missing ')'"
+-msgstr "E110: ')' ���ߤĤ���ޤ���"
++msgstr "E110: ')' �����Ĥ���ޤ���"
+ 
+ msgid "E695: Cannot index a Funcref"
+ msgstr "E695: �ؿ��ȷ��ϥ���ǥå����Ǥ��ޤ���"
+@@ -596,7 +596,7 @@
+ 
+ #, c-format
+ msgid "+-%s%3ld lines: "
+-msgstr "+-%s%3ld ��:"
++msgstr "+-%s%3ld ��: "
+ 
+ #, c-format
+ msgid "E700: Unknown function: %s"
+@@ -960,7 +960,7 @@
+ msgstr "%s ���ִ����ޤ���? (y/n/a/q/l/^E/^Y)"
+ 
+ msgid "(Interrupted) "
+-msgstr "(����ޤ�ޤ���)"
++msgstr "(����ޤ�ޤ���) "
+ 
+ msgid "1 match"
+ msgstr "1 �ս곺�����ޤ���"
+@@ -991,7 +991,7 @@
+ 
+ #, c-format
+ msgid "Pattern found in every line: %s"
+-msgstr "�ѥ��������ƤιԤǤߤĤ���ޤ���: %s"
++msgstr "�ѥ��������ƤιԤǸ��Ĥ���ޤ���: %s"
+ 
+ msgid ""
+ "\n"
+@@ -1015,7 +1015,7 @@
+ 
+ #, c-format
+ msgid "Sorry, help file \"%s\" not found"
+-msgstr "��ǰ�Ǥ����إ�ץե����� \"%s\" ���ߤĤ���ޤ���"
++msgstr "��ǰ�Ǥ����إ�ץե����� \"%s\" �����Ĥ���ޤ���"
+ 
+ #, c-format
+ msgid "E150: Not a directory: %s"
+@@ -1069,7 +1069,7 @@
+ 
+ # Added at 27-Jan-2004.
+ msgid " (NOT FOUND)"
+-msgstr "  (�ߤĤ���ޤ���)"
++msgstr "  (���Ĥ���ޤ���)"
+ 
+ msgid " (not supported)"
+ msgstr " (�󥵥ݡ���)"
+@@ -1094,7 +1094,7 @@
+ 
+ #, c-format
+ msgid "E161: Breakpoint not found: %s"
+-msgstr "E161: �֥졼���ݥ���Ȥ��ߤĤ���ޤ���: %s"
++msgstr "E161: �֥졼���ݥ���Ȥ����Ĥ���ޤ���: %s"
+ 
+ msgid "No breakpoints defined"
+ msgstr "�֥졼���ݥ���Ȥ��������Ƥ��ޤ���"
+@@ -1143,7 +1143,7 @@
+ 
+ #, c-format
+ msgid "not found in 'runtimepath': \"%s\""
+-msgstr "'runtimepath' ����ˤϤߤĤ���ޤ���: \"%s\""
++msgstr "'runtimepath' ����ˤϸ��Ĥ���ޤ���: \"%s\""
+ 
+ msgid "Source Vim script"
+ msgstr "Vim������ץȤμ����"
+@@ -1318,7 +1318,7 @@
+ 
+ #, c-format
+ msgid "E185: Cannot find color scheme %s"
+-msgstr "E185: ���顼�������� %s ���ߤĤ���ޤ���"
++msgstr "E185: ���顼�������� %s �����Ĥ���ޤ���"
+ 
+ msgid "Greetings, Vim user!"
+ msgstr "Vim �Ȥ����󡢤䤢!"
+@@ -1669,7 +1669,7 @@
+ msgstr "[�ɹ����顼]"
+ 
+ msgid "Can't find temp file for conversion"
+-msgstr "�Ѵ���ɬ�פʰ���ե����뤬�ߤĤ���ޤ���"
++msgstr "�Ѵ���ɬ�פʰ���ե����뤬���Ĥ���ޤ���"
+ 
+ msgid "Conversion with 'charconvert' failed"
+ msgstr "'charconvert' �ˤ���Ѵ������Ԥ��ޤ���"
+@@ -1725,7 +1725,7 @@
+ msgstr "E460: �꥽�����ե������������뤫�⤷��ޤ��� (! ���ɲäǶ���)"
+ 
+ msgid "E214: Can't find temp file for writing"
+-msgstr "E214: ��¸�Ѱ���ե����뤬�ߤĤ���ޤ���"
++msgstr "E214: ��¸�Ѱ���ե����뤬���Ĥ���ޤ���"
+ 
+ msgid "E213: Cannot convert (add ! to write without conversion)"
+ msgstr "E213: �Ѵ��Ǥ��ޤ��� (! ���ɲä��Ѵ���������¸)"
+@@ -1950,7 +1950,7 @@
+ 
+ #, c-format
+ msgid "E680: <buffer=%d>: invalid buffer number "
+-msgstr "E680: <�Хåե�=%d>: ̵���ʥХåե��ֹ�Ǥ�"
++msgstr "E680: <�Хåե�=%d>: ̵���ʥХåե��ֹ�Ǥ� "
+ 
+ msgid "E217: Can't execute autocommands for ALL events"
+ msgstr "E217: ���ƤΥ��٥�Ȥ��Ф��Ƥ�autocommand�ϼ¹ԤǤ��ޤ���"
+@@ -1990,7 +1990,7 @@
+ 
+ #, c-format
+ msgid "+--%3ld lines folded "
+-msgstr "+--%3ld �Ԥ��޾��ޤ�ޤ���"
++msgstr "+--%3ld �Ԥ��޾��ޤ�ޤ��� "
+ 
+ msgid "E222: Add to read buffer"
+ msgstr "E222: �ɹ��Хåե����ɲ�"
+@@ -2015,10 +2015,10 @@
+ msgstr "E227: %s �Ȥ����ޥåԥ󥰤ϴ���¸�ߤ��ޤ�"
+ 
+ msgid "No abbreviation found"
+-msgstr "û�����ϤϤߤĤ���ޤ���Ǥ���"
++msgstr "û�����Ϥϸ��Ĥ���ޤ���Ǥ���"
+ 
+ msgid "No mapping found"
+-msgstr "�ޥåԥ󥰤ϤߤĤ���ޤ���Ǥ���"
++msgstr "�ޥåԥ󥰤ϸ��Ĥ���ޤ���Ǥ���"
+ 
+ msgid "E228: makemap: Illegal mode"
+ msgstr "E228: makemap: �����ʥ⡼��"
+@@ -2193,7 +2193,7 @@
+ msgstr "E481: �ϰϻ���ϵ��Ĥ���Ƥ��ޤ���"
+ 
+ msgid "E36: Not enough room"
+-msgstr "E36: ��ʬ�����̤�����ޤ���"
++msgstr "E36: ������ɥ��˽�ʬ�ʹ⤵�⤷������������ޤ���"
+ 
+ #, c-format
+ msgid "E247: no registered server named \"%s\""
+@@ -2234,11 +2234,11 @@
+ msgstr "E41: ���꤬�Ԥ��̤Ƥޤ���!"
+ 
+ msgid "Pattern not found"
+-msgstr "�ѥ�����ϤߤĤ���ޤ���Ǥ���"
++msgstr "�ѥ�����ϸ��Ĥ���ޤ���Ǥ���"
+ 
+ #, c-format
+ msgid "E486: Pattern not found: %s"
+-msgstr "E486: �ѥ�����ϤߤĤ���ޤ���Ǥ���: %s"
++msgstr "E486: �ѥ�����ϸ��Ĥ���ޤ���Ǥ���: %s"
+ 
+ msgid "E487: Argument must be positive"
+ msgstr "E487: ����������ͤǤʤ���Фʤ�ޤ���"
+@@ -2404,7 +2404,7 @@
+ msgstr "��������ΰ��֤˥ޥå��Ϥ���ޤ���, ���򸡺����Ƥ��ޤ�"
+ 
+ msgid "<cannot open> "
+-msgstr "<�����ޤ���>"
++msgstr "<�����ޤ���> "
+ 
+ #, c-format
+ msgid "E616: vim_SelFile: can't get font %s"
+@@ -2541,7 +2541,7 @@
+ 
+ #, c-format
+ msgid "E671: Cannot find window title \"%s\""
+-msgstr "E671: �����ȥ뤬 \"%s\" �Υ�����ɥ��ϤߤĤ���ޤ���"
++msgstr "E671: �����ȥ뤬 \"%s\" �Υ�����ɥ��ϸ��Ĥ���ޤ���"
+ 
+ #, c-format
+ msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
+@@ -2719,14 +2719,14 @@
+ msgstr "E456: �ե����� \"%s\" �򳫤��ޤ���"
+ 
+ msgid "E456: Can't find PostScript resource file \"prolog.ps\""
+-msgstr "E456: PostScript�Υ꥽�����ե����� \"prolog.ps\" ���ߤĤ���ޤ���"
++msgstr "E456: PostScript�Υ꥽�����ե����� \"prolog.ps\" �����Ĥ���ޤ���"
+ 
+ msgid "E456: Can't find PostScript resource file \"cidfont.ps\""
+-msgstr "E456: PostScript�Υ꥽�����ե����� \"cidfont.ps\" ���ߤĤ���ޤ���"
++msgstr "E456: PostScript�Υ꥽�����ե����� \"cidfont.ps\" �����Ĥ���ޤ���"
+ 
+ #, c-format
+ msgid "E456: Can't find PostScript resource file \"%s.ps\""
+-msgstr "E456: PostScript�Υ꥽�����ե����� \"%s.ps\" ���ߤĤ���ޤ���"
++msgstr "E456: PostScript�Υ꥽�����ե����� \"%s.ps\" �����Ĥ���ޤ���"
+ 
+ #, c-format
+ msgid "E620: Unable to convert to print encoding \"%s\""
+@@ -2770,7 +2770,7 @@
+ msgstr "E562: ����ˡ: cstag <ident>"
+ 
+ msgid "E257: cstag: tag not found"
+-msgstr "E257: cstag: �������ߤĤ���ޤ���"
++msgstr "E257: cstag: ���������Ĥ���ޤ���"
+ 
+ #, c-format
+ msgid "E563: stat(%s) error: %d"
+@@ -2863,7 +2863,7 @@
+ 
+ #, c-format
+ msgid "E261: cscope connection %s not found"
+-msgstr "E261: cscope��³ %s ���ߤĤ���ޤ���Ǥ���"
++msgstr "E261: cscope��³ %s �����Ĥ���ޤ���Ǥ���"
+ 
+ #, c-format
+ msgid "cscope connection %s closed"
+@@ -3054,7 +3054,7 @@
+ msgstr "���Υ�������ɽ������"
+ 
+ msgid "Find symbol"
+-msgstr "�ߤĤ�������ܥ�"
++msgstr "���Ĥ�������ܥ�"
+ 
+ msgid "Browse class"
+ msgstr "���饹�򻲾�"
+@@ -3145,7 +3145,7 @@
+ msgstr "�ϰϳ��ι��ֹ�Ǥ�"
+ 
+ msgid "unknown flag: "
+-msgstr "̤�ΤΥե饰:"
++msgstr "̤�ΤΥե饰: "
+ 
+ msgid "unknown vimOption"
+ msgstr "̤�Τ� vimOption �Ǥ�"
+@@ -3175,7 +3175,7 @@
+ 
+ msgid "cannot register callback command: buffer/window reference not found"
+ msgstr ""
+-"������Хå����ޥ�ɤ���Ͽ�Ǥ��ޤ���: �Хåե�/������ɥ��λ��Ȥ��ߤĤ���ޤ�"
++"������Хå����ޥ�ɤ���Ͽ�Ǥ��ޤ���: �Хåե�/������ɥ��λ��Ȥ����Ĥ���ޤ�"
+ "��"
+ 
+ msgid ""
+@@ -3290,7 +3290,7 @@
+ "����ˡ:"
+ 
+ msgid " vim [arguments] "
+-msgstr " vim [����]"
++msgstr " vim [����] "
+ 
+ msgid ""
+ "\n"
+@@ -3670,7 +3670,7 @@
+ "# �ե�������ޡ��������� (��������Τ���Ť����):\n"
+ 
+ msgid "Missing '>'"
+-msgstr "'>' ���ߤĤ���ޤ���"
++msgstr "'>' �����Ĥ���ޤ���"
+ 
+ msgid "E543: Not a valid codepage"
+ msgstr "E543: ̵���ʥ����ɥڡ����Ǥ�"
+@@ -3739,7 +3739,7 @@
+ 
+ #, c-format
+ msgid "E305: No swap file found for %s"
+-msgstr "E305: %s �ˤϥ���åץե����뤬�ߤĤ���ޤ���"
++msgstr "E305: %s �ˤϥ���åץե����뤬���Ĥ���ޤ���"
+ 
+ msgid "Enter number of swap file to use (0 to quit): "
+ msgstr "���Ѥ��륹��åץե�������ֹ�����Ϥ��Ƥ�������(0 �ǽ�λ): "
+@@ -4013,7 +4013,7 @@
+ 
+ #, c-format
+ msgid "E316: ml_get: cannot find line %ld"
+-msgstr "E316: ml_get: �� %ld ��ߤĤ����ޤ���"
++msgstr "E316: ml_get: �� %ld �򸫤Ĥ����ޤ���"
+ 
+ msgid "E317: pointer block id wrong 3"
+ msgstr "E317: �ݥ��󥿥֥�å���ID���ְ�äƤ��ޤ� 3"
+@@ -4032,7 +4032,7 @@
+ 
+ #, c-format
+ msgid "E320: Cannot find line %ld"
+-msgstr "E320: �� %ld ���ߤĤ���ޤ���"
++msgstr "E320: �� %ld �����Ĥ���ޤ���"
+ 
+ msgid "E317: pointer block id wrong"
+ msgstr "E317: �ݥ��󥿥֥�å���ID���ְ�äƤ��ޤ�"
+@@ -4196,7 +4196,7 @@
+ 
+ #, c-format
+ msgid "E334: Menu not found: %s"
+-msgstr "E334: ��˥塼���ߤĤ���ޤ���: %s"
++msgstr "E334: ��˥塼�����Ĥ���ޤ���: %s"
+ 
+ #, c-format
+ msgid "E335: Menu not defined for %s mode"
+@@ -4206,7 +4206,7 @@
+ msgstr "E336: ��˥塼�ѥ��ϥ��֥�˥塼�������ʤ���Ф����ޤ���"
+ 
+ msgid "E337: Menu not found - check menu names"
+-msgstr "E337: ��˥塼���ߤĤ���ޤ��� - ��˥塼̾���ǧ���Ƥ�������"
++msgstr "E337: ��˥塼�����Ĥ���ޤ��� - ��˥塼̾���ǧ���Ƥ�������"
+ 
+ #, c-format
+ msgid "Error detected while processing %s:"
+@@ -4484,11 +4484,11 @@
+ msgstr "%ld �Ԥ�����ǥ�Ȥ���ޤ�... "
+ 
+ msgid "1 line indented "
+-msgstr "1 �Ԥ򥤥�ǥ�Ȥ��ޤ���"
++msgstr "1 �Ԥ򥤥�ǥ�Ȥ��ޤ��� "
+ 
+ #, c-format
+ msgid "%ld lines indented "
+-msgstr "%ld �Ԥ򥤥�ǥ�Ȥ��ޤ���"
++msgstr "%ld �Ԥ򥤥�ǥ�Ȥ��ޤ��� "
+ 
+ msgid "E748: No previously used register"
+ msgstr "E748: �ޤ��쥸��������Ѥ��Ƥ��ޤ���"
+@@ -4599,7 +4599,7 @@
+ msgstr "E521: = �θ�ˤϿ����ɬ�פǤ�"
+ 
+ msgid "E522: Not found in termcap"
+-msgstr "E522: termcap ��ˤߤĤ���ޤ���"
++msgstr "E522: termcap ��˸��Ĥ���ޤ���"
+ 
+ #, c-format
+ msgid "E539: Illegal character <%s>"
+@@ -4973,7 +4973,7 @@
+ "External commands will not pause after completion.\n"
+ "See  :help win32-vimrun  for more information."
+ msgstr ""
+-"VIMRUN.EXE�� $PATH ����ˤߤĤ���ޤ���.\n"
++"VIMRUN.EXE�� $PATH ����˸��Ĥ���ޤ���.\n"
+ "�����ޥ�ɤν�λ��˰����ߤ򤷤ޤ���.\n"
+ "�ܺ٤�  :help win32-vimrun  �򻲾Ȥ��Ƥ�������."
+ 
+@@ -5208,11 +5208,11 @@
+ 
+ #, c-format
+ msgid "E384: search hit TOP without match for: %s"
+-msgstr "E384: ��ޤǸ�����������ɳ����ս�Ϥ���ޤ���: %s"
++msgstr "E384: ��ޤǸ������ޤ����������ս�Ϥ���ޤ���: %s"
+ 
+ #, c-format
+ msgid "E385: search hit BOTTOM without match for: %s"
+-msgstr "E385: ���ޤǸ�����������ɳ����ս�Ϥ���ޤ���: %s"
++msgstr "E385: ���ޤǸ������ޤ����������ս�Ϥ���ޤ���: %s"
+ 
+ msgid "E386: Expected '?' or '/'  after ';'"
+ msgstr "E386: ';' �Τ��Ȥˤ� '?' �� '/' �����Ԥ���Ƥ���"
+@@ -5222,10 +5222,10 @@
+ 
+ #. cursor at status line
+ msgid "--- Included files "
+-msgstr "--- ���󥯥롼�ɤ��줿�ե�����"
++msgstr "--- ���󥯥롼�ɤ��줿�ե����� "
+ 
+ msgid "not found "
+-msgstr "�ߤĤ���ޤ��� "
++msgstr "���Ĥ���ޤ��� "
+ 
+ msgid "in path ---\n"
+ msgstr "�ѥ��� ----\n"
+@@ -5234,7 +5234,7 @@
+ msgstr "  (�������)"
+ 
+ msgid "  NOT FOUND"
+-msgstr "  �ߤĤ���ޤ���"
++msgstr "  ���Ĥ���ޤ���"
+ 
+ #, c-format
+ msgid "Scanning included file: %s"
+@@ -5248,16 +5248,16 @@
+ msgstr "E387: ���߹Ԥ˳���������ޤ�"
+ 
+ msgid "All included files were found"
+-msgstr "���ƤΥ��󥯥롼�ɤ��줿�ե����뤬�ߤĤ���ޤ���"
++msgstr "���ƤΥ��󥯥롼�ɤ��줿�ե����뤬���Ĥ���ޤ���"
+ 
+ msgid "No included files"
+ msgstr "���󥯥롼�ɥե�����Ϥ���ޤ���"
+ 
+ msgid "E388: Couldn't find definition"
+-msgstr "E388: �����ߤĤ����ޤ���"
++msgstr "E388: ����򸫤Ĥ����ޤ���"
+ 
+ msgid "E389: Couldn't find pattern"
+-msgstr "E389: �ѥ������ߤĤ����ޤ���"
++msgstr "E389: �ѥ�����򸫤Ĥ����ޤ���"
+ 
+ msgid "Substitute "
+ msgstr "Substitute "
+@@ -5480,7 +5480,7 @@
+ 
+ #, c-format
+ msgid "Duplicate word in %s line %d: %s"
+-msgstr "%s �� %d ���ܤ� ��ʣñ�줬�ߤĤ���ޤ���: %s"
++msgstr "%s �� %d ���ܤ� ��ʣñ�줬���Ĥ���ޤ���: %s"
+ 
+ #, c-format
+ msgid "First duplicate word in %s line %d: %s"
+@@ -5620,7 +5620,7 @@
+ 
+ #, c-format
+ msgid "E753: Not found: %s"
+-msgstr "E753: �ߤĤ���ޤ���: %s"
++msgstr "E753: ���Ĥ���ޤ���: %s"
+ 
+ #, c-format
+ msgid "E778: This does not look like a .sug file: %s"
+@@ -5696,10 +5696,10 @@
+ msgstr "E392: ���Τ褦�ʹ�ʸ���饹���Ϥ���ޤ���: %s"
+ 
+ msgid "minimal "
+-msgstr "minimal"
++msgstr "minimal "
+ 
+ msgid "maximal "
+-msgstr "maximal"
++msgstr "maximal "
+ 
+ msgid "; match "
+ msgstr "; ���� "
+@@ -5718,7 +5718,7 @@
+ 
+ #, c-format
+ msgid "E394: Didn't find region item for %s"
+-msgstr "E394: %s ���ϰ����Ǥ��ߤĤ���ޤ���"
++msgstr "E394: %s ���ϰ����Ǥ����Ĥ���ޤ���"
+ 
+ msgid "E397: Filename required"
+ msgstr "E397: �ե�����̾��ɬ�פǤ�"
+@@ -5746,7 +5746,7 @@
+ 
+ #, c-format
+ msgid "E401: Pattern delimiter not found: %s"
+-msgstr "E401: �ѥ�������ڤ꤬�ߤĤ���ޤ���: %s"
++msgstr "E401: �ѥ�������ڤ꤬���Ĥ���ޤ���: %s"
+ 
+ #, c-format
+ msgid "E402: Garbage after pattern: %s"
+@@ -5788,7 +5788,7 @@
+ 
+ #, c-format
+ msgid "E411: highlight group not found: %s"
+-msgstr "E411: �ϥ��饤�ȥ��롼�פ��ߤĤ���ޤ���: %s"
++msgstr "E411: �ϥ��饤�ȥ��롼�פ����Ĥ���ޤ���: %s"
+ 
+ #, c-format
+ msgid "E412: Not enough arguments: \":highlight link %s\""
+@@ -5858,7 +5858,7 @@
+ 
+ #, c-format
+ msgid "E426: tag not found: %s"
+-msgstr "E426: �������ߤĤ���ޤ���: %s"
++msgstr "E426: ���������Ĥ���ޤ���: %s"
+ 
+ msgid "  # pri kind tag"
+ msgstr "  # pri kind tag"
+@@ -5927,10 +5927,10 @@
+ msgstr "E433: �����ե����뤬����ޤ���"
+ 
+ msgid "E434: Can't find tag pattern"
+-msgstr "E434: �����ѥ������ߤĤ����ޤ���"
++msgstr "E434: �����ѥ�����򸫤Ĥ����ޤ���"
+ 
+ msgid "E435: Couldn't find tag, just guessing!"
+-msgstr "E435: ������ߤĤ����ʤ��Τ�ñ�˿�¬���ޤ�!"
++msgstr "E435: �����򸫤Ĥ����ʤ��Τ�ñ�˿�¬���ޤ�!"
+ 
+ #, c-format
+ msgid "Duplicate field name: %s"
+@@ -5946,10 +5946,10 @@
+ msgstr "E557: termcap�ե�����򳫤��ޤ���"
+ 
+ msgid "E558: Terminal entry not found in terminfo"
+-msgstr "E558: terminfo��ü������ȥ��ߤĤ����ޤ���"
++msgstr "E558: terminfo��ü������ȥ�򸫤Ĥ����ޤ���"
+ 
+ msgid "E559: Terminal entry not found in termcap"
+-msgstr "E559: termcap��ü������ȥ��ߤĤ����ޤ���"
++msgstr "E559: termcap��ü������ȥ�򸫤Ĥ����ޤ���"
+ 
+ #, c-format
+ msgid "E436: No \"%s\" entry in termcap"
+@@ -6061,7 +6061,7 @@
+ 
+ #, c-format
+ msgid "E830: Undo number %ld not found"
+-msgstr "E830: ����ɥ��ֹ� %ld �ϤߤĤ���ޤ���"
++msgstr "E830: ����ɥ��ֹ� %ld �ϸ��Ĥ���ޤ���"
+ 
+ msgid "E438: u_undo: line numbers wrong"
+ msgstr "E438: u_undo: ���ֹ椬�ְ�äƤ��ޤ�"
+@@ -6396,7 +6396,7 @@
+ msgstr "�⡼��̵�Ǽ¹���, �����פ���ʸ������������ޤ�"
+ 
+ msgid "menu  Edit->Global Settings->Toggle Insert Mode  "
+-msgstr "��˥塼�� �Խ����������ꢪ����(�鿴��)�⡼������"
++msgstr "��˥塼�� �Խ����������ꢪ����(�鿴��)�⡼������ "
+ 
+ msgid "                              for two modes      "
+ msgstr "                              �ǥ⡼��ͭ��       "
+diff --git a/src/po/ja.sjis.po b/src/po/ja.sjis.po
+--- a/src/po/ja.sjis.po
++++ b/src/po/ja.sjis.po
+@@ -3,7 +3,7 @@
+ # Do ":help uganda"  in Vim to read copying and usage conditions.
+ # Do ":help credits" in Vim to see a list of people who contributed.
+ #
+-# Last Change: 15-Jun-2012.
++# Last Change: 29-Dec-2012.
+ #
+ # Copyright (C) 2001-12 MURAOKA Taro <koron.kaoriya@gmail.com>
+ # THIS FILE IS DISTRIBUTED UNDER THE VIM LICENSE.
+@@ -109,7 +109,7 @@
+ 
+ #, c-format
+ msgid "E92: Buffer %ld not found"
+-msgstr "E92: �o�b�t�@ %ld ���݂‚���܂���"
++msgstr "E92: �o�b�t�@ %ld �����‚���܂���"
+ 
+ #, c-format
+ msgid "E93: More than one match for %s"
+@@ -234,7 +234,7 @@
+ 
+ #, c-format
+ msgid "E102: Can't find buffer \"%s\""
+-msgstr "E102: �o�b�t�@ \"%s\" ���݂‚���܂���"
++msgstr "E102: �o�b�t�@ \"%s\" �����‚���܂���"
+ 
+ #, c-format
+ msgid "E103: Buffer \"%s\" is not in diff mode"
+@@ -247,7 +247,7 @@
+ msgstr "E104: ������Escape�͎g�p�ł��܂���"
+ 
+ msgid "E544: Keymap file not found"
+-msgstr "E544: �L�[�}�b�v�t�@�C�����݂‚���܂���"
++msgstr "E544: �L�[�}�b�v�t�@�C�������‚���܂���"
+ 
+ msgid "E105: Using :loadkeymap not in a sourced file"
+ msgstr "E105: :source �Ŏ捞�ރt�@�C���ȊO�ł� :loadkeymap ��g���܂���"
+@@ -369,7 +369,7 @@
+ msgstr "E121: ����`�̕ϐ��ł�: %s"
+ 
+ msgid "E111: Missing ']'"
+-msgstr "E111: ']' ���݂‚���܂���"
++msgstr "E111: ']' �����‚���܂���"
+ 
+ #, c-format
+ msgid "E686: Argument of %s must be a List"
+@@ -489,7 +489,7 @@
+ msgstr "E804: '%' �𕂓������_���Ƒg�ݍ��킹�Ă͎g���܂���"
+ 
+ msgid "E110: Missing ')'"
+-msgstr "E110: ')' ���݂‚���܂���"
++msgstr "E110: ')' �����‚���܂���"
+ 
+ msgid "E695: Cannot index a Funcref"
+ msgstr "E695: �֐��Q�ƌ^�̓C���f�b�N�X�ł��܂���"
+@@ -596,7 +596,7 @@
+ 
+ #, c-format
+ msgid "+-%s%3ld lines: "
+-msgstr "+-%s%3ld �s:"
++msgstr "+-%s%3ld �s: "
+ 
+ #, c-format
+ msgid "E700: Unknown function: %s"
+@@ -960,7 +960,7 @@
+ msgstr "%s �ɒu�����܂���? (y/n/a/q/l/^E/^Y)"
+ 
+ msgid "(Interrupted) "
+-msgstr "(�����܂�܂���)"
++msgstr "(�����܂�܂���) "
+ 
+ msgid "1 match"
+ msgstr "1 �ӏ��Y�����܂���"
+@@ -991,7 +991,7 @@
+ 
+ #, c-format
+ msgid "Pattern found in every line: %s"
+-msgstr "�p�^�[�����S�Ă̍s�ł݂‚���܂���: %s"
++msgstr "�p�^�[�����S�Ă̍s�Ō��‚���܂���: %s"
+ 
+ msgid ""
+ "\n"
+@@ -1015,7 +1015,7 @@
+ 
+ #, c-format
+ msgid "Sorry, help file \"%s\" not found"
+-msgstr "�c�O�ł����w���v�t�@�C�� \"%s\" ���݂‚���܂���"
++msgstr "�c�O�ł����w���v�t�@�C�� \"%s\" �����‚���܂���"
+ 
+ #, c-format
+ msgid "E150: Not a directory: %s"
+@@ -1069,7 +1069,7 @@
+ 
+ # Added at 27-Jan-2004.
+ msgid " (NOT FOUND)"
+-msgstr "  (�݂‚���܂���)"
++msgstr "  (���‚���܂���)"
+ 
+ msgid " (not supported)"
+ msgstr " (��T�|�[�g)"
+@@ -1094,7 +1094,7 @@
+ 
+ #, c-format
+ msgid "E161: Breakpoint not found: %s"
+-msgstr "E161: �u���[�N�|�C���g���݂‚���܂���: %s"
++msgstr "E161: �u���[�N�|�C���g�����‚���܂���: %s"
+ 
+ msgid "No breakpoints defined"
+ msgstr "�u���[�N�|�C���g����`����Ă��܂���"
+@@ -1143,7 +1143,7 @@
+ 
+ #, c-format
+ msgid "not found in 'runtimepath': \"%s\""
+-msgstr "'runtimepath' �̒��ɂ݂͂‚���܂���: \"%s\""
++msgstr "'runtimepath' �̒��ɂ͌��‚���܂���: \"%s\""
+ 
+ msgid "Source Vim script"
+ msgstr "Vim�X�N���v�g�̎捞��"
+@@ -1318,7 +1318,7 @@
+ 
+ #, c-format
+ msgid "E185: Cannot find color scheme %s"
+-msgstr "E185: �J���[�X�L�[�� %s ���݂‚���܂���"
++msgstr "E185: �J���[�X�L�[�� %s �����‚���܂���"
+ 
+ msgid "Greetings, Vim user!"
+ msgstr "Vim �g������A�₠!"
+@@ -1669,7 +1669,7 @@
+ msgstr "[�Ǎ��G���[]"
+ 
+ msgid "Can't find temp file for conversion"
+-msgstr "�ϊ��ɕK�v�Ȉꎞ�t�@�C�����݂‚���܂���"
++msgstr "�ϊ��ɕK�v�Ȉꎞ�t�@�C�������‚���܂���"
+ 
+ msgid "Conversion with 'charconvert' failed"
+ msgstr "'charconvert' �ɂ��ϊ������s���܂���"
+@@ -1725,7 +1725,7 @@
+ msgstr "E460: ���\\�[�X�t�H�[�N�������邩�����܂��� (! ��lj��ŋ���)"
+ 
+ msgid "E214: Can't find temp file for writing"
+-msgstr "E214: �ۑ��p�ꎞ�t�@�C�����݂‚���܂���"
++msgstr "E214: �ۑ��p�ꎞ�t�@�C�������‚���܂���"
+ 
+ msgid "E213: Cannot convert (add ! to write without conversion)"
+ msgstr "E213: �ϊ��ł��܂��� (! ��lj��ŕϊ������ɕۑ�)"
+@@ -1950,7 +1950,7 @@
+ 
+ #, c-format
+ msgid "E680: <buffer=%d>: invalid buffer number "
+-msgstr "E680: <�o�b�t�@=%d>: �����ȃo�b�t�@�ԍ��ł�"
++msgstr "E680: <�o�b�t�@=%d>: �����ȃo�b�t�@�ԍ��ł� "
+ 
+ msgid "E217: Can't execute autocommands for ALL events"
+ msgstr "E217: �S�ẴC�x���g�ɑ΂��Ă�autocommand�͎��s�ł��܂���"
+@@ -1990,7 +1990,7 @@
+ 
+ #, c-format
+ msgid "+--%3ld lines folded "
+-msgstr "+--%3ld �s���܏�܂�܂���"
++msgstr "+--%3ld �s���܏�܂�܂��� "
+ 
+ msgid "E222: Add to read buffer"
+ msgstr "E222: �Ǎ��o�b�t�@�֒lj�"
+@@ -2015,10 +2015,10 @@
+ msgstr "E227: %s �Ƃ����}�b�s���O�͊��ɑ��݂��܂�"
+ 
+ msgid "No abbreviation found"
+-msgstr "�Z�k���݂͂͂‚���܂���ł���"
++msgstr "�Z�k���͂͌��‚���܂���ł���"
+ 
+ msgid "No mapping found"
+-msgstr "�}�b�s���O�݂͂‚���܂���ł���"
++msgstr "�}�b�s���O�͌��‚���܂���ł���"
+ 
+ msgid "E228: makemap: Illegal mode"
+ msgstr "E228: makemap: �s���ȃ��[�h"
+@@ -2193,7 +2193,7 @@
+ msgstr "E481: �͈͎w��͋��‚���Ă��܂���"
+ 
+ msgid "E36: Not enough room"
+-msgstr "E36: �[���ȗe�ʂ�����܂���"
++msgstr "E36: �E�B���h�E�ɏ\\���ȍ���������͕�������܂���"
+ 
+ #, c-format
+ msgid "E247: no registered server named \"%s\""
+@@ -2234,11 +2234,11 @@
+ msgstr "E41: ���������s���ʂĂ܂���!"
+ 
+ msgid "Pattern not found"
+-msgstr "�p�^�[���݂͂‚���܂���ł���"
++msgstr "�p�^�[���͌��‚���܂���ł���"
+ 
+ #, c-format
+ msgid "E486: Pattern not found: %s"
+-msgstr "E486: �p�^�[���݂͂‚���܂���ł���: %s"
++msgstr "E486: �p�^�[���͌��‚���܂���ł���: %s"
+ 
+ msgid "E487: Argument must be positive"
+ msgstr "E487: �����͐��̒l�łȂ���΂Ȃ�܂���"
+@@ -2404,7 +2404,7 @@
+ msgstr "�J�[�\\���̈ʒu�Ƀ}�b�`�͂���܂���, ���������Ă��܂�"
+ 
+ msgid "<cannot open> "
+-msgstr "<�J���܂���>"
++msgstr "<�J���܂���> "
+ 
+ #, c-format
+ msgid "E616: vim_SelFile: can't get font %s"
+@@ -2541,7 +2541,7 @@
+ 
+ #, c-format
+ msgid "E671: Cannot find window title \"%s\""
+-msgstr "E671: �^�C�g���� \"%s\" �̃E�B���h�E�݂͂‚���܂���"
++msgstr "E671: �^�C�g���� \"%s\" �̃E�B���h�E�͌��‚���܂���"
+ 
+ #, c-format
+ msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
+@@ -2719,14 +2719,14 @@
+ msgstr "E456: �t�@�C�� \"%s\" ��J���܂���"
+ 
+ msgid "E456: Can't find PostScript resource file \"prolog.ps\""
+-msgstr "E456: PostScript�̃��\\�[�X�t�@�C�� \"prolog.ps\" ���݂‚���܂���"
++msgstr "E456: PostScript�̃��\\�[�X�t�@�C�� \"prolog.ps\" �����‚���܂���"
+ 
+ msgid "E456: Can't find PostScript resource file \"cidfont.ps\""
+-msgstr "E456: PostScript�̃��\\�[�X�t�@�C�� \"cidfont.ps\" ���݂‚���܂���"
++msgstr "E456: PostScript�̃��\\�[�X�t�@�C�� \"cidfont.ps\" �����‚���܂���"
+ 
+ #, c-format
+ msgid "E456: Can't find PostScript resource file \"%s.ps\""
+-msgstr "E456: PostScript�̃��\\�[�X�t�@�C�� \"%s.ps\" ���݂‚���܂���"
++msgstr "E456: PostScript�̃��\\�[�X�t�@�C�� \"%s.ps\" �����‚���܂���"
+ 
+ #, c-format
+ msgid "E620: Unable to convert to print encoding \"%s\""
+@@ -2770,7 +2770,7 @@
+ msgstr "E562: �g�p�@: cstag <ident>"
+ 
+ msgid "E257: cstag: tag not found"
+-msgstr "E257: cstag: �^�O���݂‚���܂���"
++msgstr "E257: cstag: �^�O�����‚���܂���"
+ 
+ #, c-format
+ msgid "E563: stat(%s) error: %d"
+@@ -2863,7 +2863,7 @@
+ 
+ #, c-format
+ msgid "E261: cscope connection %s not found"
+-msgstr "E261: cscope�ڑ� %s ���݂‚���܂���ł���"
++msgstr "E261: cscope�ڑ� %s �����‚���܂���ł���"
+ 
+ #, c-format
+ msgid "cscope connection %s closed"
+@@ -3054,7 +3054,7 @@
+ msgstr "���̃\\�[�X��\\������"
+ 
+ msgid "Find symbol"
+-msgstr "�݂‚����V���{��"
++msgstr "���‚����V���{��"
+ 
+ msgid "Browse class"
+ msgstr "�N���X��Q��"
+@@ -3145,7 +3145,7 @@
+ msgstr "�͈͊O�̍s�ԍ��ł�"
+ 
+ msgid "unknown flag: "
+-msgstr "���m�̃t���O:"
++msgstr "���m�̃t���O: "
+ 
+ msgid "unknown vimOption"
+ msgstr "���m�� vimOption �ł�"
+@@ -3175,7 +3175,7 @@
+ 
+ msgid "cannot register callback command: buffer/window reference not found"
+ msgstr ""
+-"�R�[���o�b�N�R�}���h��o�^�ł��܂���: �o�b�t�@/�E�B���h�E�̎Q�Ƃ��݂‚���܂�"
++"�R�[���o�b�N�R�}���h��o�^�ł��܂���: �o�b�t�@/�E�B���h�E�̎Q�Ƃ����‚���܂�"
+ "��"
+ 
+ msgid ""
+@@ -3290,7 +3290,7 @@
+ "�g�p�@:"
+ 
+ msgid " vim [arguments] "
+-msgstr " vim [����]"
++msgstr " vim [����] "
+ 
+ msgid ""
+ "\n"
+@@ -3670,7 +3670,7 @@
+ "# �t�@�C����}�[�N�̗��� (�V������̂���Â����):\n"
+ 
+ msgid "Missing '>'"
+-msgstr "'>' ���݂‚���܂���"
++msgstr "'>' �����‚���܂���"
+ 
+ msgid "E543: Not a valid codepage"
+ msgstr "E543: �����ȃR�[�h�y�[�W�ł�"
+@@ -3739,7 +3739,7 @@
+ 
+ #, c-format
+ msgid "E305: No swap file found for %s"
+-msgstr "E305: %s �ɂ̓X���b�v�t�@�C�����݂‚���܂���"
++msgstr "E305: %s �ɂ̓X���b�v�t�@�C�������‚���܂���"
+ 
+ msgid "Enter number of swap file to use (0 to quit): "
+ msgstr "�g�p����X���b�v�t�@�C���̔ԍ�����͂��Ă�������(0 �ŏI��): "
+@@ -4013,7 +4013,7 @@
+ 
+ #, c-format
+ msgid "E316: ml_get: cannot find line %ld"
+-msgstr "E316: ml_get: �s %ld ��݂‚����܂���"
++msgstr "E316: ml_get: �s %ld ���‚����܂���"
+ 
+ msgid "E317: pointer block id wrong 3"
+ msgstr "E317: �|�C���^�u���b�N��ID���Ԉ���Ă��܂� 3"
+@@ -4032,7 +4032,7 @@
+ 
+ #, c-format
+ msgid "E320: Cannot find line %ld"
+-msgstr "E320: �s %ld ���݂‚���܂���"
++msgstr "E320: �s %ld �����‚���܂���"
+ 
+ msgid "E317: pointer block id wrong"
+ msgstr "E317: �|�C���^�u���b�N��ID���Ԉ���Ă��܂�"
+@@ -4196,7 +4196,7 @@
+ 
+ #, c-format
+ msgid "E334: Menu not found: %s"
+-msgstr "E334: ���j���[���݂‚���܂���: %s"
++msgstr "E334: ���j���[�����‚���܂���: %s"
+ 
+ #, c-format
+ msgid "E335: Menu not defined for %s mode"
+@@ -4206,7 +4206,7 @@
+ msgstr "E336: ���j���[�p�X�̓T�u���j���[�𐶂��Ȃ���΂����܂���"
+ 
+ msgid "E337: Menu not found - check menu names"
+-msgstr "E337: ���j���[���݂‚���܂��� - ���j���[����m�F���Ă�������"
++msgstr "E337: ���j���[�����‚���܂��� - ���j���[����m�F���Ă�������"
+ 
+ #, c-format
+ msgid "Error detected while processing %s:"
+@@ -4484,11 +4484,11 @@
+ msgstr "%ld �s���C���f���g����܂�... "
+ 
+ msgid "1 line indented "
+-msgstr "1 �s��C���f���g���܂���"
++msgstr "1 �s��C���f���g���܂��� "
+ 
+ #, c-format
+ msgid "%ld lines indented "
+-msgstr "%ld �s��C���f���g���܂���"
++msgstr "%ld �s��C���f���g���܂��� "
+ 
+ msgid "E748: No previously used register"
+ msgstr "E748: �܂����W�X�^��g�p���Ă��܂���"
+@@ -4599,7 +4599,7 @@
+ msgstr "E521: = �̌�ɂ͐������K�v�ł�"
+ 
+ msgid "E522: Not found in termcap"
+-msgstr "E522: termcap ��ɂ݂‚���܂���"
++msgstr "E522: termcap ��Ɍ��‚���܂���"
+ 
+ #, c-format
+ msgid "E539: Illegal character <%s>"
+@@ -4973,7 +4973,7 @@
+ "External commands will not pause after completion.\n"
+ "See  :help win32-vimrun  for more information."
+ msgstr ""
+-"VIMRUN.EXE�� $PATH �̒��ɂ݂‚���܂���.\n"
++"VIMRUN.EXE�� $PATH �̒��Ɍ��‚���܂���.\n"
+ "�O���R�}���h�̏I����Ɉꎞ��~���܂���.\n"
+ "�ڍׂ�  :help win32-vimrun  ��Q�Ƃ��Ă�������."
+ 
+@@ -5208,11 +5208,11 @@
+ 
+ #, c-format
+ msgid "E384: search hit TOP without match for: %s"
+-msgstr "E384: ��܂Ō�����������NJY���ӏ��͂���܂���: %s"
++msgstr "E384: ��܂Ō������܂������Y���ӏ��͂���܂���: %s"
+ 
+ #, c-format
+ msgid "E385: search hit BOTTOM without match for: %s"
+-msgstr "E385: ���܂Ō�����������NJY���ӏ��͂���܂���: %s"
++msgstr "E385: ���܂Ō������܂������Y���ӏ��͂���܂���: %s"
+ 
+ msgid "E386: Expected '?' or '/'  after ';'"
+ msgstr "E386: ';' �̂��Ƃɂ� '?' �� '/' �����҂���Ă���"
+@@ -5222,10 +5222,10 @@
+ 
+ #. cursor at status line
+ msgid "--- Included files "
+-msgstr "--- �C���N���[�h���ꂽ�t�@�C��"
++msgstr "--- �C���N���[�h���ꂽ�t�@�C�� "
+ 
+ msgid "not found "
+-msgstr "�݂‚���܂��� "
++msgstr "���‚���܂��� "
+ 
+ msgid "in path ---\n"
+ msgstr "�p�X�� ----\n"
+@@ -5234,7 +5234,7 @@
+ msgstr "  (���ɗ�)"
+ 
+ msgid "  NOT FOUND"
+-msgstr "  �݂‚���܂���"
++msgstr "  ���‚���܂���"
+ 
+ #, c-format
+ msgid "Scanning included file: %s"
+@@ -5248,16 +5248,16 @@
+ msgstr "E387: ���ݍs�ɊY��������܂�"
+ 
+ msgid "All included files were found"
+-msgstr "�S�ẴC���N���[�h���ꂽ�t�@�C�����݂‚���܂���"
++msgstr "�S�ẴC���N���[�h���ꂽ�t�@�C�������‚���܂���"
+ 
+ msgid "No included files"
+ msgstr "�C���N���[�h�t�@�C���͂���܂���"
+ 
+ msgid "E388: Couldn't find definition"
+-msgstr "E388: ��`��݂‚����܂���"
++msgstr "E388: ��`���‚����܂���"
+ 
+ msgid "E389: Couldn't find pattern"
+-msgstr "E389: �p�^�[����݂‚����܂���"
++msgstr "E389: �p�^�[�����‚����܂���"
+ 
+ msgid "Substitute "
+ msgstr "Substitute "
+@@ -5480,7 +5480,7 @@
+ 
+ #, c-format
+ msgid "Duplicate word in %s line %d: %s"
+-msgstr "%s �� %d �s�ڂ� �d���P�ꂪ�݂‚���܂���: %s"
++msgstr "%s �� %d �s�ڂ� �d���P�ꂪ���‚���܂���: %s"
+ 
+ #, c-format
+ msgid "First duplicate word in %s line %d: %s"
+@@ -5620,7 +5620,7 @@
+ 
+ #, c-format
+ msgid "E753: Not found: %s"
+-msgstr "E753: �݂‚���܂���: %s"
++msgstr "E753: ���‚���܂���: %s"
+ 
+ #, c-format
+ msgid "E778: This does not look like a .sug file: %s"
+@@ -5696,10 +5696,10 @@
+ msgstr "E392: ���̂悤�ȍ\\���N���X�^�͂���܂���: %s"
+ 
+ msgid "minimal "
+-msgstr "minimal"
++msgstr "minimal "
+ 
+ msgid "maximal "
+-msgstr "maximal"
++msgstr "maximal "
+ 
+ msgid "; match "
+ msgstr "; �Y�� "
+@@ -5718,7 +5718,7 @@
+ 
+ #, c-format
+ msgid "E394: Didn't find region item for %s"
+-msgstr "E394: %s �͈̔͗v�f���݂‚���܂���"
++msgstr "E394: %s �͈̔͗v�f�����‚���܂���"
+ 
+ msgid "E397: Filename required"
+ msgstr "E397: �t�@�C�������K�v�ł�"
+@@ -5746,7 +5746,7 @@
+ 
+ #, c-format
+ msgid "E401: Pattern delimiter not found: %s"
+-msgstr "E401: �p�^�[����؂肪�݂‚���܂���: %s"
++msgstr "E401: �p�^�[����؂肪���‚���܂���: %s"
+ 
+ #, c-format
+ msgid "E402: Garbage after pattern: %s"
+@@ -5788,7 +5788,7 @@
+ 
+ #, c-format
+ msgid "E411: highlight group not found: %s"
+-msgstr "E411: �n�C���C�g�O���[�v���݂‚���܂���: %s"
++msgstr "E411: �n�C���C�g�O���[�v�����‚���܂���: %s"
+ 
+ #, c-format
+ msgid "E412: Not enough arguments: \":highlight link %s\""
+@@ -5858,7 +5858,7 @@
+ 
+ #, c-format
+ msgid "E426: tag not found: %s"
+-msgstr "E426: �^�O���݂‚���܂���: %s"
++msgstr "E426: �^�O�����‚���܂���: %s"
+ 
+ msgid "  # pri kind tag"
+ msgstr "  # pri kind tag"
+@@ -5927,10 +5927,10 @@
+ msgstr "E433: �^�O�t�@�C��������܂���"
+ 
+ msgid "E434: Can't find tag pattern"
+-msgstr "E434: �^�O�p�^�[����݂‚����܂���"
++msgstr "E434: �^�O�p�^�[�����‚����܂���"
+ 
+ msgid "E435: Couldn't find tag, just guessing!"
+-msgstr "E435: �^�O��݂‚����Ȃ��̂ŒP�ɐ������܂�!"
++msgstr "E435: �^�O���‚����Ȃ��̂ŒP�ɐ������܂�!"
+ 
+ #, c-format
+ msgid "Duplicate field name: %s"
+@@ -5946,10 +5946,10 @@
+ msgstr "E557: termcap�t�@�C����J���܂���"
+ 
+ msgid "E558: Terminal entry not found in terminfo"
+-msgstr "E558: terminfo�ɒ[���G���g����݂‚����܂���"
++msgstr "E558: terminfo�ɒ[���G���g�����‚����܂���"
+ 
+ msgid "E559: Terminal entry not found in termcap"
+-msgstr "E559: termcap�ɒ[���G���g����݂‚����܂���"
++msgstr "E559: termcap�ɒ[���G���g�����‚����܂���"
+ 
+ #, c-format
+ msgid "E436: No \"%s\" entry in termcap"
+@@ -6061,7 +6061,7 @@
+ 
+ #, c-format
+ msgid "E830: Undo number %ld not found"
+-msgstr "E830: �A���h�D�ԍ� %ld �݂͂‚���܂���"
++msgstr "E830: �A���h�D�ԍ� %ld �͌��‚���܂���"
+ 
+ msgid "E438: u_undo: line numbers wrong"
+ msgstr "E438: u_undo: �s�ԍ����Ԉ���Ă��܂�"
+@@ -6396,7 +6396,7 @@
+ msgstr "���[�h���Ŏ��s��, �^�C�v�����������}������܂�"
+ 
+ msgid "menu  Edit->Global Settings->Toggle Insert Mode  "
+-msgstr "���j���[�� �ҏW���S�̐ݒ聨�}��(���S��)���[�h�ؑ�"
++msgstr "���j���[�� �ҏW���S�̐ݒ聨�}��(���S��)���[�h�ؑ� "
+ 
+ msgid "                              for two modes      "
+ msgstr "                              ���[�h�L��       "

update-menu_ja.patch

+# HG changeset patch
+# Parent ed968b13f88b3101e9d9c590d2e2a9ac8bcbef36
+diff --git a/runtime/lang/menu_ja_jp.euc-jp.vim b/runtime/lang/menu_ja_jp.euc-jp.vim
+--- a/runtime/lang/menu_ja_jp.euc-jp.vim
++++ b/runtime/lang/menu_ja_jp.euc-jp.vim
+@@ -2,7 +2,7 @@
+ "
+ " Menu Translations:	Japanese (EUC-JP)
+ " Translated By:	MURAOKA Taro  <koron.kaoriya@gmail.com>
+-" Last Change:		15-Jun-2012.
++" Last Change:		29-Dec-2012.
+ "
+ " Copyright (C) 2001-12 MURAOKA Taro <koron.kaoriya@gmail.com>
+ " THIS FILE IS DISTRIBUTED UNDER THE VIM LICENSE.
+@@ -241,6 +241,8 @@
+ menutrans &Delete		���(&D)
+ menutrans Select\ Blockwise	����֥�å�����
+ menutrans Select\ &Word		����(&W)
++menutrans Select\ &Sentence	ʸ����(&S)
++menutrans Select\ Pa&ragraph	��������(&R)
+ menutrans Select\ &Line		������(&L)
+ menutrans Select\ &Block	�֥�å�����(&B)
+ menutrans Select\ &All		���٤�����(&A)
+diff --git a/runtime/lang/menu_ja_jp.utf-8.vim b/runtime/lang/menu_ja_jp.utf-8.vim
+--- a/runtime/lang/menu_ja_jp.utf-8.vim
++++ b/runtime/lang/menu_ja_jp.utf-8.vim
+@@ -2,7 +2,7 @@
+ "
+ " Menu Translations:	Japanese (UTF-8)
+ " Translated By:	MURAOKA Taro  <koron.kaoriya@gmail.com>
+-" Last Change:		15-Jun-2012.
++" Last Change:		29-Dec-2012.
+ "
+ " Copyright (C) 2001-12 MURAOKA Taro <koron.kaoriya@gmail.com>
+ " THIS FILE IS DISTRIBUTED UNDER THE VIM LICENSE.
+@@ -241,6 +241,8 @@
+ menutrans &Delete		削除(&D)
+ menutrans Select\ Blockwise	矩形ブロック選択
+ menutrans Select\ &Word		単語選択(&W)
++menutrans Select\ &Sentence	文選択(&S)
++menutrans Select\ Pa&ragraph	段落選択(&R)
+ menutrans Select\ &Line		行選択(&L)
+ menutrans Select\ &Block	ブロック選択(&B)
+ menutrans Select\ &All		すべて選択(&A)
+diff --git a/runtime/lang/menu_japanese_japan.932.vim b/runtime/lang/menu_japanese_japan.932.vim
+--- a/runtime/lang/menu_japanese_japan.932.vim
++++ b/runtime/lang/menu_japanese_japan.932.vim
+@@ -2,7 +2,7 @@
+ "
+ " Menu Translations:	Japanese (CP932)
+ " Translated By:	MURAOKA Taro  <koron.kaoriya@gmail.com>
+-" Last Change:		15-Jun-2012.
++" Last Change:		29-Dec-2012.
+ "
+ " Copyright (C) 2001-12 MURAOKA Taro <koron.kaoriya@gmail.com>
+ " THIS FILE IS DISTRIBUTED UNDER THE VIM LICENSE.
+@@ -241,6 +241,8 @@
+ menutrans &Delete		�폜(&D)
+ menutrans Select\ Blockwise	��`�u���b�N�I��
+ menutrans Select\ &Word		�P��I��(&W)
++menutrans Select\ &Sentence	���I��(&S)
++menutrans Select\ Pa&ragraph	�i���I��(&R)
+ menutrans Select\ &Line		�s�I��(&L)
+ menutrans Select\ &Block	�u���b�N�I��(&B)
+ menutrans Select\ &All		���ׂđI��(&A)

version_acl_xpm.patch

+# HG changeset patch
+# Parent f31131101d618b54f713604888b21ece0a1c1727
+diff --git a/src/eval.c b/src/eval.c
+--- a/src/eval.c
++++ b/src/eval.c
+@@ -12065,6 +12065,9 @@
+ #ifndef CASE_INSENSITIVE_FILENAME
+ 	"fname_case",
+ #endif
++#ifdef HAVE_ACL
++	"acl",
++#endif
+ #ifdef FEAT_ARABIC
+ 	"arabic",
+ #endif
+@@ -12469,6 +12472,8 @@
+ #endif
+ #ifdef FEAT_XPM_W32
+ 	"xpm_w32",
++#elif defined(HAVE_XPM)
++	"xpm",
+ #endif
+ #ifdef USE_XSMP
+ 	"xsmp",
+diff --git a/src/version.c b/src/version.c
+--- a/src/version.c
++++ b/src/version.c
+@@ -58,6 +58,11 @@
+ 
+ static char *(features[]) =
+ {
++#ifdef HAVE_ACL
++	"+acl",
++#else
++	"-acl",
++#endif
+ #ifdef AMIGA		/* only for Amiga systems */
+ # ifdef FEAT_ARP
+ 	"+ARP",
+@@ -719,6 +724,12 @@
+ # else
+ 	"-xpm_w32",
+ # endif
++#else
++# ifdef HAVE_XPM
++	"+xpm",
++# else
++	"-xpm",
++# endif
+ #endif
+ 	NULL
+ };

vim_on_cygwin_using_win32_clipboard__full__7.3.785.patch

+# HG changeset patch
+# Parent 7b6ce7d3fc1f036bf95a8f8f24b17721d898ae8b
+
+diff --git a/src/Make_bc5.mak b/src/Make_bc5.mak
+--- a/src/Make_bc5.mak
++++ b/src/Make_bc5.mak
+@@ -694,7 +694,7 @@
+ 
+ !if ($(OSTYPE)==WIN32)
+ vimobj = $(vimobj) \
+-	$(OBJDIR)\os_win32.obj $(OBJDIR)\os_mswin.obj
++	$(OBJDIR)\os_win32.obj $(OBJDIR)\os_mswin.obj $(OBJDIR)\winclip.obj
+ !elif ($(OSTYPE)==DOS16)
+ vimobj = $(vimobj) \
+ 	$(OBJDIR)\os_msdos.obj
+diff --git a/src/Make_cyg.mak b/src/Make_cyg.mak
+--- a/src/Make_cyg.mak
++++ b/src/Make_cyg.mak
+@@ -517,6 +517,7 @@
+ 	$(OUTDIR)/option.o \
+ 	$(OUTDIR)/os_win32.o \
+ 	$(OUTDIR)/os_mswin.o \
++	$(OUTDIR)/winclip.o \
+ 	$(OUTDIR)/pathdef.o \
+ 	$(OUTDIR)/popupmnu.o \
+ 	$(OUTDIR)/quickfix.o \
+diff --git a/src/Make_ivc.mak b/src/Make_ivc.mak
+--- a/src/Make_ivc.mak
++++ b/src/Make_ivc.mak
+@@ -241,6 +241,7 @@
+ 	"$(INTDIR)/ops.obj" \
+ 	"$(INTDIR)/option.obj" \
+ 	"$(INTDIR)/os_mswin.obj" \
++	"$(INTDIR)/winclip.obj" \
+ 	"$(INTDIR)/os_win32.obj" \
+ 	"$(INTDIR)/popupmnu.obj" \
+ 	"$(INTDIR)/quickfix.obj" \
+@@ -600,6 +601,10 @@
+ # End Source File
+ # Begin Source File
+ 
++SOURCE=.\winclip.c
++# End Source File
++# Begin Source File
++
+ SOURCE=.\os_win32.c
+ # End Source File
+ # Begin Source File
+diff --git a/src/Make_ming.mak b/src/Make_ming.mak
+--- a/src/Make_ming.mak
++++ b/src/Make_ming.mak
+@@ -520,6 +520,7 @@
+ 	$(OUTDIR)/option.o \
+ 	$(OUTDIR)/os_win32.o \
+ 	$(OUTDIR)/os_mswin.o \
++	$(OUTDIR)/winclip.o \
+ 	$(OUTDIR)/pathdef.o \
+ 	$(OUTDIR)/popupmnu.o \
+ 	$(OUTDIR)/quickfix.o \
+diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
+--- a/src/Make_mvc.mak
++++ b/src/Make_mvc.mak
+@@ -543,6 +543,7 @@
+ 	$(OUTDIR)\ops.obj \
+ 	$(OUTDIR)\option.obj \
+ 	$(OUTDIR)\os_mswin.obj \
++	$(OUTDIR)\winclip.obj \
+ 	$(OUTDIR)\os_win32.obj \
+ 	$(OUTDIR)\pathdef.obj \
+ 	$(OUTDIR)\popupmnu.obj \
+@@ -1149,6 +1150,8 @@
+ 
+ $(OUTDIR)/os_mswin.obj:	$(OUTDIR) os_mswin.c  $(INCL)
+ 
++$(OUTDIR)/winclip.obj: $(OUTDIR) winclip.c  $(INCL)
++
+ $(OUTDIR)/os_win32.obj:	$(OUTDIR) os_win32.c  $(INCL) os_win32.h
+ 
+ $(OUTDIR)/os_w32exe.obj:	$(OUTDIR) os_w32exe.c  $(INCL)
+@@ -1256,6 +1259,7 @@
+ 	proto/ops.pro \
+ 	proto/option.pro \
+ 	proto/os_mswin.pro \
++	proto/winclip.pro \
+ 	proto/os_win32.pro \
+ 	proto/popupmnu.pro \
+ 	proto/quickfix.pro \
+diff --git a/src/Make_w16.mak b/src/Make_w16.mak
+--- a/src/Make_w16.mak
++++ b/src/Make_w16.mak
+@@ -107,6 +107,7 @@
+    $(INTDIR)\os_win16.obj\
+    $(INTDIR)\os_msdos.obj\
+    $(INTDIR)\os_mswin.obj\
++   $(INTDIR)\winclip.obj\
+    $(INTDIR)\popupmnu.obj\
+    $(INTDIR)\quickfix.obj\
+    $(INTDIR)\regexp.obj\
+diff --git a/src/Makefile b/src/Makefile
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -1637,7 +1637,7 @@
+ RSRC_DIR = os_mac_rsrc
+ 
+ PRO_MANUAL = os_amiga.pro os_msdos.pro os_win16.pro os_win32.pro \
+-	os_mswin.pro os_beos.pro os_vms.pro $(PERL_PRO)
++	os_mswin.pro winclip.pro os_beos.pro os_vms.pro $(PERL_PRO)
+ 
+ # Default target is making the executable and tools
+ all: $(VIMTARGET) $(TOOLS) languages $(GUI_BUNDLE)
+@@ -1796,6 +1796,10 @@
+ 	$(CPROTO) -DWIN16 -DWIN32 -UHAVE_CONFIG_H $< > proto/$@
+ 	echo "/* vim: set ft=c : */" >> proto/$@
+ 
++winclip.pro: winclip.c
++	$(CPROTO) -DWIN16 -DWIN32 -UHAVE_CONFIG_H $< > proto/$@
++	echo "/* vim: set ft=c : */" >> proto/$@
++
+ os_beos.pro: os_beos.c
+ 	$(CPROTO) -D__BEOS__ -UHAVE_CONFIG_H $< > proto/$@
+ 	echo "/* vim: set ft=c : */" >> proto/$@
+@@ -2649,6 +2653,12 @@
+ objects/os_unix.o: os_unix.c
+ 	$(CCC) -o $@ os_unix.c
+ 
++objects/os_mswin.o: os_mswin.c
++	$(CCC) -o $@ os_mswin.c
++
++objects/winclip.o: winclip.c
++	$(CCC) -o $@ winclip.c
++
+ objects/pathdef.o: auto/pathdef.c
+ 	$(CCC) -o $@ auto/pathdef.c
+ 
+@@ -2977,6 +2987,10 @@
+  ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
+  gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \
+  arabic.h version.h
++objects/winclip.o: winclip.c vimio.h vim.h auto/config.h feature.h os_unix.h \
++ auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
++ regexp.h gui.h ex_cmds.h proto.h globals.h farsi.h arabic.h \
++ proto/winclip.pro
+ objects/window.o: window.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
+  ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
+  gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \
+diff --git a/src/auto/configure b/src/auto/configure
+--- a/src/auto/configure
++++ b/src/auto/configure
+@@ -8844,6 +8844,29 @@
+ 
+ 
+ 
++echo "$as_me:$LINENO: checking for CYGWIN environment" >&5
++echo $ECHO_N "checking for CYGWIN environment... $ECHO_C" >&6
++case `uname` in
++    CYGWIN*)    CYGWIN=yes; echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++                echo "$as_me:$LINENO: checking for CYGWIN clipboard support" >&5
++echo $ECHO_N "checking for CYGWIN clipboard support... $ECHO_C" >&6
++                if test "x$with_x" = "xno" ; then
++                  OS_EXTRA_SRC=winclip.c; OS_EXTRA_OBJ=objects/winclip.o
++                  echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++                  cat >>confdefs.h <<\_ACEOF
++#define FEAT_CYGWIN_WIN32_CLIPBOARD 1
++_ACEOF
++
++                else
++                  echo "$as_me:$LINENO: result: no - using X11" >&5
++echo "${ECHO_T}no - using X11" >&6
++                fi ;;
++
++    *)          CYGWIN=no; echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6;;
++esac
+ 
+ if test "$enable_hangulinput" = "yes"; then
+   if test "x$GUITYPE" = "xNONE"; then
+diff --git a/src/config.h.in b/src/config.h.in
+--- a/src/config.h.in
++++ b/src/config.h.in
+@@ -439,3 +439,6 @@
+ 
+ /* Define if fcntl()'s F_SETFD command knows about FD_CLOEXEC */
+ #undef HAVE_FD_CLOEXEC
++
++/* Define if you want Cygwin to use the WIN32 clipboard, not compatible with X11*/
++#undef FEAT_CYGWIN_WIN32_CLIPBOARD
+diff --git a/src/configure.in b/src/configure.in
+--- a/src/configure.in
++++ b/src/configure.in
+@@ -2472,6 +2472,21 @@
+ dnl end of GUI-checking
+ dnl ---------------------------------------------------------------------------
+ 
++dnl Check for Cygwin, which needs an extra source file if not using X11
++AC_MSG_CHECKING(for CYGWIN environment)
++case `uname` in
++    CYGWIN*)    CYGWIN=yes; AC_MSG_RESULT(yes)
++                AC_MSG_CHECKING(for CYGWIN clipboard support)
++                if test "x$with_x" = "xno" ; then
++                  OS_EXTRA_SRC=winclip.c; OS_EXTRA_OBJ=objects/winclip.o
++                  AC_MSG_RESULT(yes)
++                  AC_DEFINE(FEAT_CYGWIN_WIN32_CLIPBOARD)
++                else
++                  AC_MSG_RESULT(no - using X11)
++                fi ;;
++
++    *)          CYGWIN=no; AC_MSG_RESULT(no);;
++esac
+ 
+ dnl Only really enable hangul input when GUI and XFONTSET are available
+ if test "$enable_hangulinput" = "yes"; then
+diff --git a/src/feature.h b/src/feature.h
+--- a/src/feature.h
++++ b/src/feature.h
+@@ -1122,6 +1122,11 @@
+  * +xterm_clipboard	Unix only: Include code for handling the clipboard
+  *			in an xterm like in the GUI.
+  */
++
++#ifdef FEAT_CYGWIN_WIN32_CLIPBOARD
++# define FEAT_CLIPBOARD
++#endif
++
+ #ifdef FEAT_GUI
+ # ifndef FEAT_CLIPBOARD
+ #  define FEAT_CLIPBOARD
+diff --git a/src/globals.h b/src/globals.h
+--- a/src/globals.h
++++ b/src/globals.h
+@@ -802,7 +802,7 @@
+ EXTERN int	enc_unicode INIT(= 0);	/* 2: UCS-2 or UTF-16, 4: UCS-4 */
+ EXTERN int	enc_utf8 INIT(= FALSE);		/* UTF-8 encoded Unicode */
+ EXTERN int	enc_latin1like INIT(= TRUE);	/* 'encoding' is latin1 comp. */
+-# ifdef WIN3264
++# if defined(WIN3264) || defined(FEAT_CYGWIN_WIN32_CLIPBOARD)
+ /* Codepage nr of 'encoding'.  Negative means it's not been set yet, zero
+  * means 'encoding' is not a valid codepage. */
+ EXTERN int	enc_codepage INIT(= -1);
+diff --git a/src/mbyte.c b/src/mbyte.c
+--- a/src/mbyte.c
++++ b/src/mbyte.c
+@@ -613,7 +613,7 @@
+     enc_dbcs = enc_dbcs_new;
+     has_mbyte = (enc_dbcs != 0 || enc_utf8);
+ 
+-#ifdef WIN3264
++#if defined(WIN3264) || defined(FEAT_CYGWIN_WIN32_CLIPBOARD)
+     enc_codepage = encname2codepage(p_enc);
+     enc_latin9 = (STRCMP(p_enc, "iso-8859-15") == 0);
+ #endif
+@@ -4081,7 +4081,7 @@
+     return enc_canonize((char_u *)buf);
+ }
+ 
+-#if defined(WIN3264) || defined(PROTO)
++#if defined(WIN3264) || defined(PROTO) || defined(FEAT_CYGWIN_WIN32_CLIPBOARD)
+ /*
+  * Convert an encoding name to an MS-Windows codepage.
+  * Returns zero if no codepage can be figured out.
+diff --git a/src/os_mswin.c b/src/os_mswin.c
+--- a/src/os_mswin.c
++++ b/src/os_mswin.c
+@@ -905,736 +905,6 @@
+ }
+ #endif
+ 
+-#if defined(FEAT_MBYTE) || defined(PROTO)
+-/*
+- * Convert an UTF-8 string to UTF-16.
+- * "instr[inlen]" is the input.  "inlen" is in bytes.
+- * When "outstr" is NULL only return the number of UTF-16 words produced.
+- * Otherwise "outstr" must be a buffer of sufficient size.
+- * Returns the number of UTF-16 words produced.
+- */
+-    int
+-utf8_to_utf16(char_u *instr, int inlen, short_u *outstr, int *unconvlenp)
+-{
+-    int		outlen = 0;
+-    char_u	*p = instr;
+-    int		todo = inlen;
+-    int		l;
+-    int		ch;
+-
+-    while (todo > 0)
+-    {
+-	/* Only convert if we have a complete sequence. */
+-	l = utf_ptr2len_len(p, todo);
+-	if (l > todo)
+-	{
+-	    /* Return length of incomplete sequence. */
+-	    if (unconvlenp != NULL)
+-		*unconvlenp = todo;
+-	    break;
+-	}
+-
+-	ch = utf_ptr2char(p);
+-	if (ch >= 0x10000)
+-	{
+-	    /* non-BMP character, encoding with surrogate pairs */
+-	    ++outlen;
+-	    if (outstr != NULL)
+-	    {
+-		*outstr++ = (0xD800 - (0x10000 >> 10)) + (ch >> 10);
+-		*outstr++ = 0xDC00 | (ch & 0x3FF);
+-	    }
+-	}
+-	else if (outstr != NULL)
+-	    *outstr++ = ch;
+-	++outlen;
+-	p += l;
+-	todo -= l;
+-    }
+-
+-    return outlen;
+-}
+-
+-/*
+- * Convert an UTF-16 string to UTF-8.
+- * The input is "instr[inlen]" with "inlen" in number of UTF-16 words.
+- * When "outstr" is NULL only return the required number of bytes.
+- * Otherwise "outstr" must be a buffer of sufficient size.
+- * Return the number of bytes produced.
+- */
+-    int
+-utf16_to_utf8(short_u *instr, int inlen, char_u *outstr)
+-{
+-    int		outlen = 0;
+-    int		todo = inlen;
+-    short_u	*p = instr;
+-    int		l;
+-    int		ch, ch2;
+-
+-    while (todo > 0)
+-    {
+-	ch = *p;
+-	if (ch >= 0xD800 && ch <= 0xDBFF && todo > 1)
+-	{
+-	    /* surrogate pairs handling */
+-	    ch2 = p[1];
+-	    if (ch2 >= 0xDC00 && ch2 <= 0xDFFF)
+-	    {
+-		ch = ((ch - 0xD800) << 10) + (ch2 & 0x3FF) + 0x10000;
+-		++p;
+-		--todo;
+-	    }
+-	}
+-	if (outstr != NULL)
+-	{
+-	    l = utf_char2bytes(ch, outstr);
+-	    outstr += l;
+-	}
+-	else
+-	    l = utf_char2len(ch);
+-	++p;
+-	outlen += l;
+-	--todo;
+-    }
+-
+-    return outlen;
+-}
+-
+-/*
+- * Call MultiByteToWideChar() and allocate memory for the result.
+- * Returns the result in "*out[*outlen]" with an extra zero appended.
+- * "outlen" is in words.
+- */
+-    void
+-MultiByteToWideChar_alloc(UINT cp, DWORD flags,
+-	LPCSTR in, int inlen,
+-	LPWSTR *out, int *outlen)
+-{
+-    *outlen = MultiByteToWideChar(cp, flags, in, inlen, 0, 0);
+-    /* Add one one word to avoid a zero-length alloc(). */
+-    *out = (LPWSTR)alloc(sizeof(WCHAR) * (*outlen + 1));
+-    if (*out != NULL)
+-    {
+-	MultiByteToWideChar(cp, flags, in, inlen, *out, *outlen);
+-	(*out)[*outlen] = 0;
+-    }
+-}
+-
+-/*
+- * Call WideCharToMultiByte() and allocate memory for the result.
+- * Returns the result in "*out[*outlen]" with an extra NUL appended.
+- */
+-    void
+-WideCharToMultiByte_alloc(UINT cp, DWORD flags,
+-	LPCWSTR in, int inlen,
+-	LPSTR *out, int *outlen,
+-	LPCSTR def, LPBOOL useddef)
+-{
+-    *outlen = WideCharToMultiByte(cp, flags, in, inlen, NULL, 0, def, useddef);
+-    /* Add one one byte to avoid a zero-length alloc(). */
+-    *out = alloc((unsigned)*outlen + 1);
+-    if (*out != NULL)
+-    {
+-	WideCharToMultiByte(cp, flags, in, inlen, *out, *outlen, def, useddef);
+-	(*out)[*outlen] = 0;
+-    }
+-}
+-
+-#endif /* FEAT_MBYTE */
+-
+-#ifdef FEAT_CLIPBOARD
+-/*
+- * Clipboard stuff, for cutting and pasting text to other windows.
+- */
+-
+-/* Type used for the clipboard type of Vim's data. */
+-typedef struct
+-{
+-    int type;		/* MCHAR, MBLOCK or MLINE */
+-    int txtlen;		/* length of CF_TEXT in bytes */
+-    int ucslen;		/* length of CF_UNICODETEXT in words */
+-    int rawlen;		/* length of clip_star.format_raw, including encoding,
+-			   excluding terminating NUL */
+-} VimClipType_t;
+-
+-/*
+- * Make vim the owner of the current selection.  Return OK upon success.
+- */
+-/*ARGSUSED*/
+-    int
+-clip_mch_own_selection(VimClipboard *cbd)
+-{
+-    /*
+-     * Never actually own the clipboard.  If another application sets the
+-     * clipboard, we don't want to think that we still own it.
+-     */
+-    return FAIL;
+-}
+-
+-/*
+- * Make vim NOT the owner of the current selection.
+- */
+-/*ARGSUSED*/
+-    void
+-clip_mch_lose_selection(VimClipboard *cbd)
+-{
+-    /* Nothing needs to be done here */
+-}
+-
+-/*
+- * Copy "str[*size]" into allocated memory, changing CR-NL to NL.
+- * Return the allocated result and the size in "*size".
+- * Returns NULL when out of memory.
+- */
+-    static char_u *
+-crnl_to_nl(const char_u *str, int *size)
+-{
+-    int		pos = 0;
+-    int		str_len = *size;
+-    char_u	*ret;
+-    char_u	*retp;
+-
+-    /* Avoid allocating zero bytes, it generates an error message. */
+-    ret = lalloc((long_u)(str_len == 0 ? 1 : str_len), TRUE);
+-    if (ret != NULL)
+-    {
+-	retp = ret;
+-	for (pos = 0; pos < str_len; ++pos)
+-	{
+-	    if (str[pos] == '\r' && str[pos + 1] == '\n')
+-	    {
+-		++pos;
+-		--(*size);
+-	    }
+-	    *retp++ = str[pos];
+-	}
+-    }
+-
+-    return ret;
+-}
+-
+-/*
+- * Wait for another process to Close the Clipboard.
+- * Returns TRUE for success.
+- */
+-    static int
+-vim_open_clipboard(void)
+-{
+-    int delay = 10;
+-
+-    while (!OpenClipboard(NULL))
+-    {
+-	if (delay > 500)
+-	    return FALSE;  /* waited too long, give up */
+-	Sleep(delay);
+-	delay *= 2;	/* wait for 10, 20, 40, 80, etc. msec */
+-    }
+-    return TRUE;
+-}
+-
+-/*
+- * Get the current selection and put it in the clipboard register.
+- *
+- * NOTE: Must use GlobalLock/Unlock here to ensure Win32s compatibility.
+- * On NT/W95 the clipboard data is a fixed global memory object and
+- * so its handle = its pointer.
+- * On Win32s, however, co-operation with the Win16 system means that
+- * the clipboard data is moveable and its handle is not a pointer at all,
+- * so we can't just cast the return value of GetClipboardData to (char_u*).
+- * <VN>
+- */
+-    void
+-clip_mch_request_selection(VimClipboard *cbd)
+-{
+-    VimClipType_t	metadata = { -1, -1, -1, -1 };
+-    HGLOBAL		hMem = NULL;
+-    char_u		*str = NULL;
+-#if defined(FEAT_MBYTE) && defined(WIN3264)
+-    char_u		*to_free = NULL;
+-#endif
+-#ifdef FEAT_MBYTE
+-    HGLOBAL		rawh = NULL;
+-#endif
+-    int			str_size = 0;
+-    int			maxlen;
+-    size_t		n;
+-
+-    /*
+-     * Don't pass GetActiveWindow() as an argument to OpenClipboard() because
+-     * then we can't paste back into the same window for some reason - webb.
+-     */
+-    if (!vim_open_clipboard())
+-	return;
+-
+-    /* Check for vim's own clipboard format first.  This only gets the type of
+-     * the data, still need to use CF_UNICODETEXT or CF_TEXT for the text. */
+-    if (IsClipboardFormatAvailable(cbd->format))
+-    {
+-	VimClipType_t	*meta_p;
+-	HGLOBAL		meta_h;
+-
+-	/* We have metadata on the clipboard; try to get it. */
+-	if ((meta_h = GetClipboardData(cbd->format)) != NULL
+-		&& (meta_p = (VimClipType_t *)GlobalLock(meta_h)) != NULL)
+-	{
+-	    /* The size of "VimClipType_t" changed, "rawlen" was added later.
+-	     * Only copy what is available for backwards compatibility. */
+-	    n = sizeof(VimClipType_t);
+-	    if (GlobalSize(meta_h) < n)
+-		n = GlobalSize(meta_h);
+-	    memcpy(&metadata, meta_p, n);
+-	    GlobalUnlock(meta_h);
+-	}
+-    }
+-
+-#ifdef FEAT_MBYTE
+-    /* Check for Vim's raw clipboard format first.  This is used without
+-     * conversion, but only if 'encoding' matches. */
+-    if (IsClipboardFormatAvailable(cbd->format_raw)
+-				      && metadata.rawlen > (int)STRLEN(p_enc))
+-    {
+-	/* We have raw data on the clipboard; try to get it. */
+-	if ((rawh = GetClipboardData(cbd->format_raw)) != NULL)
+-	{
+-	    char_u	*rawp;
+-
+-	    rawp = (char_u *)GlobalLock(rawh);
+-	    if (rawp != NULL && STRCMP(p_enc, rawp) == 0)
+-	    {
+-		n = STRLEN(p_enc) + 1;
+-		str = rawp + n;
+-		str_size = (int)(metadata.rawlen - n);
+-	    }
+-	    else
+-	    {
+-		GlobalUnlock(rawh);
+-		rawh = NULL;
+-	    }
+-	}
+-    }
+-    if (str == NULL)
+-    {
+-#endif
+-
+-#if defined(FEAT_MBYTE) && defined(WIN3264)
+-    /* Try to get the clipboard in Unicode if it's not an empty string. */
+-    if (IsClipboardFormatAvailable(CF_UNICODETEXT) && metadata.ucslen != 0)
+-    {
+-	HGLOBAL hMemW;
+-
+-	if ((hMemW = GetClipboardData(CF_UNICODETEXT)) != NULL)
+-	{
+-	    WCHAR *hMemWstr = (WCHAR *)GlobalLock(hMemW);
+-
+-	    /* Use the length of our metadata if possible, but limit it to the
+-	     * GlobalSize() for safety. */
+-	    maxlen = (int)(GlobalSize(hMemW) / sizeof(WCHAR));
+-	    if (metadata.ucslen >= 0)
+-	    {
+-		if (metadata.ucslen > maxlen)