updated for version 7.2a
diff --git a/src/INSTALL b/src/INSTALL
index 2269e41..210d773 100644
--- a/src/INSTALL
+++ b/src/INSTALL
@@ -14,6 +14,7 @@
See INSTALLmac.txt for Macintosh
See INSTALLpc.txt for PC (MS-DOS, Windows 95/98/NT/XP)
See INSTALLvms.txt for VMS
+See INSTALLx.txt for cross-compiling on Unix
See ../runtime/doc/os_390.txt for OS/390 Unix
See ../runtime/doc/os_beos.txt for BeBox
diff --git a/src/edit.c b/src/edit.c
index fb17eec..e04c720 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -9300,7 +9300,7 @@
i = cursor->col - fpos.col;
if (i > 0)
{
- mch_memmove(ptr, ptr + i, STRLEN(ptr + i) + 1);
+ STRMOVE(ptr, ptr + i);
/* correct replace stack. */
if ((State & REPLACE_FLAG)
#ifdef FEAT_VREPLACE
diff --git a/src/ops.c b/src/ops.c
index ba774b8..d79d75d 100644
--- a/src/ops.c
+++ b/src/ops.c
@@ -516,7 +516,7 @@
copy_spaces(newp + bd.textcol + i, (size_t)j);
/* the end */
- mch_memmove(newp + STRLEN(newp), midp, (size_t)STRLEN(midp) + 1);
+ STRMOVE(newp + STRLEN(newp), midp);
}
/* replace the line */
ml_replace(curwin->w_cursor.lnum, newp, FALSE);
@@ -616,7 +616,7 @@
if (spaces > 0)
offset += count;
- mch_memmove(newp + offset, oldp, (size_t)(STRLEN(oldp) + 1));
+ STRMOVE(newp + offset, oldp);
ml_replace(lnum, newp, FALSE);
@@ -1759,8 +1759,7 @@
(size_t)(bd.startspaces + bd.endspaces));
/* copy the part after the deleted part */
oldp += bd.textcol + bd.textlen;
- mch_memmove(newp + bd.textcol + bd.startspaces + bd.endspaces,
- oldp, STRLEN(oldp) + 1);
+ STRMOVE(newp + bd.textcol + bd.startspaces + bd.endspaces, oldp);
/* replace the line */
ml_replace(lnum, newp, FALSE);
}
@@ -2081,7 +2080,7 @@
/* insert post-spaces */
copy_spaces(newp + STRLEN(newp), (size_t)bd.endspaces);
/* copy the part after the changed part */
- mch_memmove(newp + STRLEN(newp), oldp, STRLEN(oldp) + 1);
+ STRMOVE(newp + STRLEN(newp), oldp);
}
/* replace the line */
ml_replace(curwin->w_cursor.lnum, newp, FALSE);
@@ -2696,7 +2695,7 @@
mch_memmove(newp + offset, ins_text, (size_t)ins_len);
offset += ins_len;
oldp += bd.textcol;
- mch_memmove(newp + offset, oldp, STRLEN(oldp) + 1);
+ STRMOVE(newp + offset, oldp);
ml_replace(linenr, newp, FALSE);
}
}
@@ -3662,7 +3661,7 @@
mch_memmove(ptr, y_array[0], (size_t)yanklen);
ptr += yanklen;
}
- mch_memmove(ptr, oldp + col, STRLEN(oldp + col) + 1);
+ STRMOVE(ptr, oldp + col);
ml_replace(lnum, newp, FALSE);
/* Put cursor on last putted char. */
curwin->w_cursor.col += (colnr_T)(totlen - 1);
diff --git a/src/option.c b/src/option.c
index 885c547..8543b48 100644
--- a/src/option.c
+++ b/src/option.c
@@ -2846,7 +2846,6 @@
#ifdef FEAT_SCROLLBIND
static char *(p_scbopt_values[]) = {"ver", "hor", "jump", NULL};
#endif
-static char *(p_swb_values[]) = {"useopen", "usetab", "split", NULL};
static char *(p_debug_values[]) = {"msg", "throw", "beep", NULL};
#ifdef FEAT_VERTSPLIT
static char *(p_ead_values[]) = {"both", "ver", "hor", NULL};
@@ -3276,20 +3275,8 @@
}
# else
# ifdef MACOS_CONVERT
- if (mch_getenv((char_u *)"LANG") == NULL)
- {
- char buf[20];
- if (LocaleRefGetPartString(NULL,
- kLocaleLanguageMask | kLocaleLanguageVariantMask |
- kLocaleRegionMask | kLocaleRegionVariantMask,
- sizeof buf, buf) == noErr && *buf)
- {
- vim_setenv((char_u *)"LANG", (char_u *)buf);
-# ifdef HAVE_LOCALE_H
- setlocale(LC_ALL, "");
-# endif
- }
- }
+ /* Moved to os_mac_conv.c to avoid dependency problems. */
+ mac_lang_init();
# endif
# endif
@@ -4599,8 +4586,7 @@
else
{
i = (int)STRLEN(newval);
- mch_memmove(newval + i + comma, origval,
- STRLEN(origval) + 1);
+ STRMOVE(newval + i + comma, origval);
}
if (comma)
newval[i] = ',';
@@ -4629,8 +4615,7 @@
++i;
}
}
- mch_memmove(newval + (s - origval), s + i,
- STRLEN(s + i) + 1);
+ STRMOVE(newval + (s - origval), s + i);
}
}
@@ -4641,7 +4626,7 @@
if ((!(flags & P_COMMA) || *s != ',')
&& vim_strchr(s + 1, *s) != NULL)
{
- mch_memmove(s, s + 1, STRLEN(s));
+ STRMOVE(s, s + 1);
--s;
}
}
@@ -6230,7 +6215,7 @@
/* 'switchbuf' */
else if (varp == &p_swb)
{
- if (check_opt_strings(p_swb, p_swb_values, TRUE) != OK)
+ if (opt_strings_flags(p_swb, p_swb_values, &swb_flags, TRUE) != OK)
errmsg = e_invarg;
}
@@ -7183,7 +7168,7 @@
}
/* remove 's' from p_shm */
else if (!p_terse && p != NULL)
- mch_memmove(p, p + 1, STRLEN(p));
+ STRMOVE(p, p + 1);
}
/* when 'paste' is set or reset also change other options */
@@ -8177,7 +8162,8 @@
{
#ifdef FEAT_CRYPT
/* never return the value of the crypt key */
- if ((char_u **)varp == &curbuf->b_p_key)
+ if ((char_u **)varp == &curbuf->b_p_key
+ && **(char_u **)(varp) != NUL)
*stringval = vim_strsave((char_u *)"*****");
else
#endif
@@ -10032,7 +10018,7 @@
&& (options[expand_option_idx].flags & P_EXPAND)
&& vim_isfilec(var[2])
&& (var[2] != '\\' || (var == buf && var[4] != '\\')))
- mch_memmove(var, var + 1, STRLEN(var));
+ STRMOVE(var, var + 1);
#endif
*file[0] = buf;
diff --git a/src/option.h b/src/option.h
index 3818bcd..00374d7 100644
--- a/src/option.h
+++ b/src/option.h
@@ -742,6 +742,14 @@
EXTERN char_u *p_su; /* 'suffixes' */
EXTERN char_u *p_sws; /* 'swapsync' */
EXTERN char_u *p_swb; /* 'switchbuf' */
+EXTERN unsigned swb_flags;
+#ifdef IN_OPTION_C
+static char *(p_swb_values[]) = {"useopen", "usetab", "split", "newtab", NULL};
+#endif
+#define SWB_USEOPEN 0x001
+#define SWB_USETAB 0x002
+#define SWB_SPLIT 0x004
+#define SWB_NEWTAB 0x008
EXTERN int p_tbs; /* 'tagbsearch' */
EXTERN long p_tl; /* 'taglength' */
EXTERN int p_tr; /* 'tagrelative' */
diff --git a/src/po/ja.sjis.po b/src/po/ja.sjis.po
index 96c2037..9b9ea23 100644
--- a/src/po/ja.sjis.po
+++ b/src/po/ja.sjis.po
@@ -3,16 +3,17 @@
# 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-6.
-# Last Change: 18-Apr-2006.
+# MURAOKA Taro <koron.kaoriya@gmail.com>, 2001-8.
+# Last Change: 31-May-2008.
#
msgid ""
msgstr ""
-"Project-Id-Version: Vim 7.0\n"
-"POT-Creation-Date: 2006-04-18 11:00+0900\n"
-"PO-Revision-Date: 2006-04-18 11:30+0900\n"
-"Last-Translator: MURAOKA Taro <koron@tka.att.ne.jp>\n"
-"Language-Team: MURAOKA Taro <koron@tka.att.ne.jp>\n"
+"Project-Id-Version: Vim 7.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-05-31 22:00+0900\n"
+"PO-Revision-Date: 2008-05-31 22:30+0900\n"
+"Last-Translator: MURAOKA Taro <koron.kaoriya@gmail.com>\n"
+"Language-Team: MURAOKA Taro <koron.kaoriya@gmail.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=cp932\n"
"Content-Transfer-Encoding: 8-bit\n"
@@ -114,12 +115,15 @@
msgid "[readonly]"
msgstr "[Çêp]"
+#, c-format
msgid "1 line --%d%%--"
msgstr "1 s --%d%%--"
+#, c-format
msgid "%ld lines --%d%%--"
msgstr "%ld s --%d%%--"
+#, c-format
msgid "line %ld of %ld --%d%%-- col "
msgstr "s %ld (SÌ %ld) --%d%%-- col "
@@ -145,6 +149,7 @@
msgid "Top"
msgstr "æª"
+#, c-format
msgid ""
"\n"
"# Buffer list:\n"
@@ -189,6 +194,9 @@
msgid "E99: Current buffer is not in diff mode"
msgstr "E99: »ÝÌobt@Í·ª[hÅÍ èܹñ"
+msgid "E793: No other buffer in diff mode is modifiable"
+msgstr "E793: ·ª[hÅ é¼Ìobt@ÍÏXÂ\\Å·"
+
msgid "E100: No other buffer in diff mode"
msgstr "E100: ·ª[hÅ é¼Ìobt@Í èܹñ"
@@ -216,6 +224,9 @@
msgid "E105: Using :loadkeymap not in a sourced file"
msgstr "E105: :source ÅæÞt@CÈOÅÍ :loadkeymap ðg¦Ü¹ñ"
+msgid "E791: Empty keymap entry"
+msgstr "E791: óÌL[}bvGg"
+
msgid " Keyword completion (^N^P)"
msgstr " L[[hâ® (^N^P)"
@@ -282,6 +293,7 @@
msgid "Scanning: %s"
msgstr "XL: %s"
+#, c-format
msgid "Scanning tags."
msgstr "^OðXL."
@@ -338,7 +350,7 @@
msgstr "E713: «^ÉóÌL[ðg¤±ÆÍūܹñ"
msgid "E714: List required"
-msgstr "E471: Xg^ªKvÅ·"
+msgstr "E714: Xg^ªKvÅ·"
msgid "E715: Dictionary required"
msgstr "E715: «^ªKvÅ·"
@@ -613,6 +625,10 @@
msgstr "E706: ÏÌ^ªêvµÜ¹ñ: %s"
#, c-format
+msgid "E795: Cannot delete variable %s"
+msgstr "E795: Ï %s ðíūܹñ"
+
+#, c-format
msgid "E741: Value is locked: %s"
msgstr "E741: lªbN³êĢܷ: %s"
@@ -678,6 +694,7 @@
msgid "E133: :return not inside a function"
msgstr "E133: ÖOÉ :return ª èܵ½"
+#, c-format
msgid ""
"\n"
"# global variables:\n"
@@ -744,6 +761,7 @@
msgid " FAILED"
msgstr " ¸s"
+#. avoid a wait_return for this message, it's annoying
#, c-format
msgid "E137: Viminfo file is not writable: %s"
msgstr "E137: viminfot@CªÝūܹñ: %s"
@@ -761,6 +779,7 @@
msgid "# This viminfo file was generated by Vim %s.\n"
msgstr "# ±Ì viminfo t@CÍ Vim %s ÉæÁĶ¬³êܵ½.\n"
+#, c-format
msgid ""
"# You may edit it if you're careful!\n"
"\n"
@@ -768,6 +787,7 @@
"# ÏX·éÛÉÍ\\ªÓµÄ¾³¢!\n"
"\n"
+#, c-format
msgid "# Value of 'encoding' when this file was written\n"
msgstr "# ±Ìt@Cª©ê½Ì 'encoding' Ìl\n"
@@ -810,6 +830,20 @@
"\"%s\" ÉÍ 'readonly' IvVªÝè³êĢܷ.\n"
"㫧ðµÜ·©?"
+#, c-format
+msgid ""
+"File permissions of \"%s\" are read-only.\n"
+"It may still be possible to write it.\n"
+"Do you wish to try?"
+msgstr ""
+"t@C \"%s\" Ìp[~bVªÇêpÅ·.\n"
+"»êÅà°ç«Þ±ÆÍÂ\\Å·.\n"
+"p±µÜ·©?"
+
+#, c-format
+msgid "E505: \"%s\" is read-only (add ! to override)"
+msgstr "E505: \"%s\" ÍÇêpÅ· (§ÉÍ ! ðÇÁ)"
+
msgid "Edit File"
msgstr "t@CðÒW"
@@ -864,6 +898,7 @@
msgid "Pattern found in every line: %s"
msgstr "p^[ªSÄÌsÅÝ©èܵ½: %s"
+#, c-format
msgid ""
"\n"
"# Last Substitute String:\n"
@@ -1207,10 +1242,10 @@
msgid "Append File"
msgstr "ÇÁt@C"
-msgid "E747: Cannot change directory, buffer is modifed (add ! to override)"
+msgid "E747: Cannot change directory, buffer is modified (add ! to override)"
msgstr ""
-"E747: obt@ªC³³êÄ¢éÌÅ, fBNgðÏXūܹñ (! "
-"ðÇÁÅã)"
+"E747: obt@ªC³³êÄ¢éÌÅ, fBNgðÏXūܹñ (! ðÇÁÅ"
+"ã)"
msgid "E186: No previous directory"
msgstr "E186: OÌfBNgÍ èܹñ"
@@ -1446,6 +1481,9 @@
msgid "is not a file"
msgstr " Ít@CÅÍ èܹñ"
+msgid "is a device (disabled with 'opendevice' option)"
+msgstr " ÍfoCXÅ· ('opendevice' IvVÅñðÅ«Ü·)"
+
msgid "[New File]"
msgstr "[Vt@C]"
@@ -1483,6 +1521,9 @@
msgid "[socket]"
msgstr "[\\Pbg]"
+msgid "[character special]"
+msgstr "[LN^EfoCX]"
+
msgid "[RO]"
msgstr "[Çê]"
@@ -1543,6 +1584,9 @@
msgid "is not a file or writable device"
msgstr "Ít@CÅàÝÂ\\foCXÅà èܹñ"
+msgid "writing to device disabled with 'opendevice' option"
+msgstr "'opendevice' IvVÉæèfoCXÖÌ«ÝÍūܹñ"
+
msgid "is read-only (add ! to override)"
msgstr "ÍÇêpÅ· (§ÉÍ ! ðÇÁ)"
@@ -2151,6 +2195,7 @@
msgid "No text to be printed"
msgstr "óü·éeLXgª èܹñ"
+#, c-format
msgid "Printing page %d (%d%%)"
msgstr "óü: y[W %d (%d%%)"
@@ -2290,15 +2335,15 @@
msgid "cs_create_connection exec failed"
msgstr "cs_create_connection ÌÀsɸsµÜµ½"
-msgid "E623: Could not spawn cscope process"
-msgstr "E623: cscopevZXðN®Å«Ü¹ñŵ½"
-
msgid "cs_create_connection: fdopen for to_fp failed"
msgstr "cs_create_connection: to_fp Ì fdopen ɸsµÜµ½"
msgid "cs_create_connection: fdopen for fr_fp failed"
msgstr "cs_create_connection: fr_fp Ì fdopen ɸsµÜµ½"
+msgid "E623: Could not spawn cscope process"
+msgstr "E623: cscopevZXðN®Å«Ü¹ñŵ½"
+
msgid "E567: no cscope connections"
msgstr "E567: cscopeڱɸsµÜµ½"
@@ -2373,8 +2418,8 @@
"???: Sorry, this command is disabled, the MzScheme library could not be "
"loaded."
msgstr ""
-"???: ±ÌR}hͳøÅ·, ²ßñȳ¢: MzScheme "
-"Cuð[hūܹñŵ½."
+"???: ±ÌR}hͳøÅ·, ²ßñȳ¢: MzScheme Cuð[hÅ«Ü"
+"¹ñŵ½."
msgid "invalid expression"
msgstr "³øȮŷ"
@@ -2427,25 +2472,12 @@
msgid "not allowed in the Vim sandbox"
msgstr "Th{bNXÅͳêܹñ"
-#, c-format
-msgid "E370: Could not load library %s"
-msgstr "E370: Cu %s ð[hūܹñŵ½"
-
-msgid "Sorry, this command is disabled: the Perl library could not be loaded."
-msgstr ""
-"±ÌR}hͳøÅ·, ²ßñȳ¢: PerlCuð[hūܹñŵ½."
-
-msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
-msgstr ""
-"E299: Th{bNXÅÍ Safe "
-"W
[ðgpµÈ¢PerlXNvgÍÖ¶çêĢܷ"
-
msgid ""
"E263: Sorry, this command is disabled, the Python library could not be "
"loaded."
msgstr ""
-"E263: ±ÌR}hͳøÅ·,²ßñȳ¢: "
-"PythonCuð[hūܹñŵ½."
+"E263: ±ÌR}hͳøÅ·,²ßñȳ¢: PythonCuð[hūܹñ"
+"ŵ½."
# Added at 07-Feb-2004.
msgid "E659: Cannot invoke Python recursively"
@@ -2512,11 +2544,11 @@
msgid ""
"E266: Sorry, this command is disabled, the Ruby library could not be loaded."
msgstr ""
-"E266: ±ÌR}hͳøÅ·,²ßñȳ¢: "
-"RubyCuð[hūܹñŵ½."
+"E266: ±ÌR}hͳøÅ·,²ßñȳ¢: RubyCuð[hūܹñÅ"
+"µ½."
msgid "E267: unexpected return"
-msgstr "E265: \\ú¹Ê return Å·"
+msgstr "E267: \\ú¹Ê return Å·"
msgid "E268: unexpected next"
msgstr "E268: \\ú¹Ê next Å·"
@@ -2595,8 +2627,8 @@
"Cannot connect to SNiFF+. Check environment (sniffemacs must be found in "
"$PATH).\n"
msgstr ""
-"SNiFF+Éڱūܹñ. «ð`FbNµÄ¾³¢(sniffemacs ª $PATH "
-"ÉȯêÎÈèܹñ).\n"
+"SNiFF+Éڱūܹñ. «ð`FbNµÄ¾³¢(sniffemacs ª $PATH Éȯ"
+"êÎÈèܹñ).\n"
msgid "E274: Sniff: Error during read. Disconnected"
msgstr "E274: Sniff: ÇÉG[ª¶µÜµ½. ØfµÜµ½"
@@ -2660,8 +2692,8 @@
msgid "cannot create buffer/window command: object is being deleted"
msgstr ""
-"obt@/EBhEì¬R}hðì¬Å«Ü¹ñ: "
-"IuWFNgªÁ³êĢܵ½"
+"obt@/EBhEì¬R}hðì¬Å«Ü¹ñ: IuWFNgªÁ³êÄ¢Ü"
+"µ½"
msgid ""
"cannot register callback command: buffer/window is already being deleted"
@@ -2670,27 +2702,27 @@
#. This should never happen. Famous last word?
msgid ""
-"E280: TCL FATAL ERROR: reflist corrupt!? Please report this to "
-"vim-dev@vim.org"
+"E280: TCL FATAL ERROR: reflist corrupt!? Please report this to vim-dev@vim."
+"org"
msgstr ""
"E280: TCL v½IG[: reflist õ!? vim-dev@vim.org ÉñµÄ¾³¢"
msgid "cannot register callback command: buffer/window reference not found"
msgstr ""
-"R[obNR}hðo^ūܹñ: "
-"obt@/EBhEÌQƪÝ©èܹñ"
+"R[obNR}hðo^ūܹñ: obt@/EBhEÌQƪÝ©èܹ"
+"ñ"
msgid ""
"E571: Sorry, this command is disabled: the Tcl library could not be loaded."
msgstr ""
-"E571: ±ÌR}hͳøÅ·,²ßñȳ¢: "
-"TclCuð[hūܹñŵ½."
+"E571: ±ÌR}hͳøÅ·,²ßñȳ¢: TclCuð[hūܹñÅ"
+"µ½."
msgid ""
"E281: TCL ERROR: exit code is not int!? Please report this to vim-dev@vim.org"
msgstr ""
-"E281: TCL G[: I¹R[hª®lÅÍ èܹñ!? vim-dev@vim.org "
-"ÉñµÄ¾³¢"
+"E281: TCL G[: I¹R[hª®lÅÍ èܹñ!? vim-dev@vim.org Éñµ"
+"ľ³¢"
#, c-format
msgid "E572: exit code %d"
@@ -2801,8 +2833,12 @@
"\n"
" àµÍ:"
-msgid "where case is ignored prepend / to make flag upper case"
-msgstr "嶬¶Í³³êÜ· / tOÍå¶ÉµÄ¾³¢"
+msgid ""
+"\n"
+"Where case is ignored prepend / to make flag upper case"
+msgstr ""
+"\n"
+"嬶ª³³êéêÍå¶É·é½ßÉ / ðOuµÄ¾³¢"
msgid ""
"\n"
@@ -2870,8 +2906,8 @@
msgid "-N\t\t\tNot fully Vi compatible: 'nocompatible'"
msgstr "-N\t\t\tViñÝ·[h: 'nocompatible"
-msgid "-V[N]\t\tVerbose level"
-msgstr "-V[N]\t\tVerbose x"
+msgid "-V[N][fname]\t\tBe verbose [level N] [log messages to fname]"
+msgstr "-V[N][fname]\t\tOoÍÝè [x N] [Ot@C¼ fname]"
msgid "-D\t\t\tDebugging mode"
msgstr "-D\t\t\tfobO[h"
@@ -2971,8 +3007,11 @@
"--remote-wait-silent <files> Same, don't complain if there is no server"
msgstr "--remote-wait-silent <files> ¯ã, T[oª³Äàx¶ðo͵Ȣ"
-msgid "--remote-tab <files> As --remote but open tab page for each file"
-msgstr "--remote-tab <files> --remoteÅt@C1ÂÉ«1ÂÌ^uy[WðJ"
+msgid ""
+"--remote-tab[-wait][-silent] <files> As --remote but use tab page per file"
+msgstr ""
+"--remote-tab[-wait][-silent] <files> --remoteÅt@C1ÂÉ«1ÂÌ^u"
+"y[WðJ"
msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit"
msgstr "--remote-send <keys>\tVimT[oÉ <keys> ðMµÄI¹·é"
@@ -3097,6 +3136,9 @@
msgid "-P <parent title>\tOpen Vim inside parent application"
msgstr "-P <eÌ^Cg>\tVimðeAvP[VÌÅN®·é"
+msgid "--windowid <HWND>\tOpen Vim inside another win32 widget"
+msgstr "--windowid <HWND>\tÙÈéWin32 widgetÌàÉVimðJ"
+
msgid "No display"
msgstr "fBXvCª©Â©èܹñ"
@@ -3149,6 +3191,7 @@
"\n"
"ÏX s ñ eLXg"
+#, c-format
msgid ""
"\n"
"# File marks:\n"
@@ -3157,6 +3200,7 @@
"# t@C}[N:\n"
#. Write the jumplist with -'
+#, c-format
msgid ""
"\n"
"# Jumplist (newest first):\n"
@@ -3164,6 +3208,7 @@
"\n"
"# WvXg (Vµ¢à̪æ):\n"
+#, c-format
msgid ""
"\n"
"# History of marks within files (newest to oldest):\n"
@@ -3289,6 +3334,9 @@
",\n"
"àµÍt@Cª¹µÄ¢Ü·."
+msgid " has been damaged (page size is smaller than minimum value).\n"
+msgstr " ͹µÄ¢Ü· (y[WTCYªÅ¬lðºñÁĢܷ).\n"
+
#, c-format
msgid "Using swap file \"%s\""
msgstr "Xbvt@C \"%s\" ðgp"
@@ -3629,6 +3677,10 @@
msgid "E329: No menu \"%s\""
msgstr "E329: \"%s\" Æ¢¤j
[Í èܹñ"
+#. Only a mnemonic or accelerator is not valid.
+msgid "E792: Empty menu name"
+msgstr "E792: j
[¼ªóÅ·"
+
msgid "E330: Menu path must not lead to a sub-menu"
msgstr "E330: j
[pXÍTuj
[ð¶¶é׫ÅÍ èܹñ"
@@ -3680,7 +3732,7 @@
msgstr "E354: ³øÈWX^¼: '%s'"
msgid "Messages maintainer: Bram Moolenaar <Bram@vim.org>"
-msgstr "ú{êbZ[W|ó/ÄC: ºª ¾Y <koron@tka.att.ne.jp>"
+msgstr "ú{êbZ[W|ó/ÄC: ºª ¾Y <koron.kaoriya@gmail.com>"
msgid "Interrupt: "
msgstr "Ý: "
@@ -3776,6 +3828,7 @@
msgid "Vim: Finished.\n"
msgstr "Vim: I¹µÜµ½.\n"
+#, c-format
msgid "ERROR: "
msgstr "G[: "
@@ -3839,8 +3892,8 @@
"E343: Invalid path: '**[number]' must be at the end of the path or be "
"followed by '%s'."
msgstr ""
-"E343: ³øÈpXÅ·: '**[l]' ÍpathÌÅã© '%s' "
-"ª±¢ÄȢƢ¯Ü¹ñ."
+"E343: ³øÈpXÅ·: '**[l]' ÍpathÌÅã© '%s' ª±¢ÄȢƢ¯Ü¹"
+"ñ."
#, c-format
msgid "E344: Can't find directory \"%s\" in cdpath"
@@ -3984,6 +4037,7 @@
msgid "Illegal register name"
msgstr "s³ÈWX^¼"
+#, c-format
msgid ""
"\n"
"# Registers:\n"
@@ -4140,6 +4194,13 @@
msgid "E355: Unknown option: %s"
msgstr "E355: ¢mÌIvVÅ·: %s"
+#. There's another character after zeros or the string
+#. * is empty. In both cases, we are trying to set a
+#. * num option using a string.
+#, c-format
+msgid "E521: Number required: &%s = '%s'"
+msgstr "E521: ªKvÅ·: &%s = '%s'"
+
msgid ""
"\n"
"--- Terminal codes ---"
@@ -4270,6 +4331,7 @@
msgid "Vim: Caught deadly signal %s\n"
msgstr "Vim: v½IVOi %s ðmµÜµ½\n"
+#, c-format
msgid "Vim: Caught deadly signal\n"
msgstr "Vim: v½IVOiðmµÜµ½\n"
@@ -4292,6 +4354,20 @@
msgid ""
"\n"
+"Could not get security context for "
+msgstr ""
+"\n"
+"ZL
eBReLXgðæ¾Å«Ü¹ñ "
+
+msgid ""
+"\n"
+"Could not set security context for "
+msgstr ""
+"\n"
+"ZL
eBReLXgðÝèūܹñ "
+
+msgid ""
+"\n"
"Cannot execute shell "
msgstr ""
"\n"
@@ -4399,21 +4475,26 @@
msgid "Vim Warning"
msgstr "VimÌx"
+#, c-format
msgid "E372: Too many %%%c in format string"
msgstr "E372: tH[}bg¶ñÉ %%%c ª½ß¬Ü·"
+#, c-format
msgid "E373: Unexpected %%%c in format string"
msgstr "E373: tH[}bg¶ñÉ\\ú¹Ê %%%c ª èܵ½"
msgid "E374: Missing ] in format string"
msgstr "E374: tH[}bg¶ñÉ ] ª èܹñ"
+#, c-format
msgid "E375: Unsupported %%%c in format string"
msgstr "E375: tH[}bg¶ñÅÍ %%%c ÍT|[g³êܹñ"
+#, c-format
msgid "E376: Invalid %%%c in format string prefix"
msgstr "E376: tH[}bg¶ñÌOuɳøÈ %%%c ª èÜ·"
+#, c-format
msgid "E377: Invalid %%%c in format string"
msgstr "E377: tH[}bg¶ñɳøÈ %%%c ª èÜ·"
@@ -4459,6 +4540,10 @@
msgid "E777: String or List expected"
msgstr "E777: ¶ñ©XgªKvÅ·"
+#, c-format
+msgid "E369: invalid item in %s%%[]"
+msgstr "E369: ³øÈÚÅ·: %s%%[]"
+
msgid "E339: Pattern too long"
msgstr "E339: p^[ª·ß¬Ü·"
@@ -4472,6 +4557,7 @@
msgid "E52: Unmatched \\z("
msgstr "E52: \\z( ªÞèÁĢܹñ"
+#, c-format
msgid "E53: Unmatched %s%%("
msgstr "E53: %s%%( ªÞèÁĢܹñ"
@@ -4524,17 +4610,21 @@
msgstr "E68: \\z ÌãÉs³È¶ª èܵ½"
#
+#, c-format
msgid "E69: Missing ] after %s%%["
msgstr "E69: %s%%[ ÌãÉ ] ª èܹñ"
+#, c-format
msgid "E70: Empty %s%%[]"
msgstr "E70: %s%%[] ªóÅ·"
#
+#, c-format
msgid "E678: Invalid character after %s%%[dxouU]"
msgstr "E678: %s%%[dxouU] ÌãÉs³È¶ª èܵ½"
#
+#, c-format
msgid "E71: Invalid character after %s%%"
msgstr "E71: %s%% ÌãÉs³È¶ª èܵ½"
@@ -4752,16 +4842,16 @@
"Defining COMPOUNDFORBIDFLAG after PFX item may give wrong results in %s line "
"%d"
msgstr ""
-"%s Ì %d sÚÌ PFX ÚÌãÌ COMPOUNDFORBIDFLAG "
-"Ìè`ÍëÁ½Êð¶¶é±Æª èÜ·"
+"%s Ì %d sÚÌ PFX ÚÌãÌ COMPOUNDFORBIDFLAG Ìè`ÍëÁ½Êð¶¶é"
+"±Æª èÜ·"
#, c-format
msgid ""
"Defining COMPOUNDPERMITFLAG after PFX item may give wrong results in %s line "
"%d"
msgstr ""
-"%s Ì %d sÚÌ PFX ÚÌãÌ COMPOUNDPERMITFLAG "
-"Ìè`ÍëÁ½Êð¶¶é±Æª èÜ·"
+"%s Ì %d sÚÌ PFX ÚÌãÌ COMPOUNDPERMITFLAG Ìè`ÍëÁ½Êð¶¶é"
+"±Æª èÜ·"
#, c-format
msgid "Wrong COMPOUNDWORDMAX value in %s line %d: %s"
@@ -4920,6 +5010,7 @@
msgid "Ignored %d words with non-ASCII characters"
msgstr "ñASCII¶ðÜÞ %d ÂÌPêð³µÜµ½"
+#, c-format
msgid "Compressed %d of %d nodes; %d (%d%%) remaining"
msgstr "m[h %d Â(S %d Â) ð³kµÜµ½; cè %d (%d%%)"
@@ -4991,6 +5082,7 @@
msgid "Sorry, only %ld suggestions"
msgstr "cOÅ·ª, C³óâÍ %ld µ© èܹñ"
+#. for when 'cmdheight' > 1
#. avoid more prompt
#, c-format
msgid "Change \"%.*s\" to:"
@@ -5396,6 +5488,9 @@
msgid "%ld seconds ago"
msgstr "%ld boߵĢܷ"
+msgid "E790: undojoin is not allowed after undo"
+msgstr "E790: undo ̼ãÉ undojoin Íūܹñ"
+
msgid "E439: undo list corrupt"
msgstr "E439: AhDXgªóêĢܷ"
@@ -5412,6 +5507,13 @@
msgid ""
"\n"
+"MS-Windows 64 bit GUI version"
+msgstr ""
+"\n"
+"MS-Windows 64 rbg GUI Å"
+
+msgid ""
+"\n"
"MS-Windows 32 bit GUI version"
msgstr ""
"\n"
@@ -5727,6 +5829,19 @@
msgid "E447: Can't find file \"%s\" in path"
msgstr "E447: pathÉÍ \"%s\" Æ¢¤t@Cª èܹñ"
+#, c-format
+msgid "E370: Could not load library %s"
+msgstr "E370: Cu %s ð[hūܹñŵ½"
+
+msgid "Sorry, this command is disabled: the Perl library could not be loaded."
+msgstr ""
+"±ÌR}hͳøÅ·, ²ßñȳ¢: PerlCuð[hūܹñŵ½."
+
+msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
+msgstr ""
+"E299: Th{bNXÅÍ Safe W
[ðgpµÈ¢PerlXNvgÍÖ¶çê"
+"Ģܷ"
+
msgid "Edit with &multiple Vims"
msgstr "¡ÌVimÅÒW·é (&M)"
@@ -5739,6 +5854,7 @@
msgid "Edit with &Vim"
msgstr "VimÅÒW·é (&V)"
+#. Now concatenate
msgid "Edit with existing Vim - "
msgstr "ù¶ÌVimÅÒW·é - "
@@ -5994,8 +6110,8 @@
msgstr "E46: ÇæêpÏ \"%s\" ÉÍlðÝèūܹñ"
#, c-format
-msgid "E46: Cannot set variable in the sandbox: \"%s\""
-msgstr "E46: Th{bNXÅÍÏ \"%s\" ÉlðÝèūܹñ"
+msgid "E794: Cannot set variable in the sandbox: \"%s\""
+msgstr "E794: Th{bNXÅÍÏ \"%s\" ÉlðÝèūܹñ"
msgid "E47: Error while reading errorfile"
msgstr "E47: G[t@CÌÇÉG[ª¶µÜµ½"
@@ -6079,7 +6195,6 @@
msgid "E749: empty buffer"
msgstr "E749: obt@ªóÅ·"
-#
msgid "E682: Invalid search pattern or delimiter"
msgstr "E682: õp^[©æØèLªs³Å·"
diff --git a/src/po/no.po b/src/po/no.po
index 9853eb5..d01dc93 100644
--- a/src/po/no.po
+++ b/src/po/no.po
@@ -1249,7 +1249,7 @@
msgid "Append File"
msgstr "Legg til fil"
-msgid "E747: Cannot change directory, buffer is modifed (add ! to override)"
+msgid "E747: Cannot change directory, buffer is modified (add ! to override)"
msgstr ""
"E747: Kan ikke skifte katalog, bufferen er forandret (legg til ! for å "
"overstyre)"
@@ -1492,8 +1492,8 @@
msgid "is not a file"
msgstr "er ikke en fil"
-msgid "is a device (disabled with 'opendevice' option"
-msgstr "er en enhet (frakoblet med 'opendevice'-valg"
+msgid "is a device (disabled with 'opendevice' option)"
+msgstr "er en enhet (frakoblet med 'opendevice'-valg)"
msgid "[New File]"
msgstr "[Ny fil]"
@@ -4742,7 +4742,7 @@
msgstr "E759: Formateringsfeil i stavefil"
msgid "E758: Truncated spell file"
-msgstr "E237: Valg av skriver feilet"
+msgstr "E758: Valg av skriver feilet"
#, c-format
msgid "Trailing text in %s line %d: %s"
@@ -5034,7 +5034,7 @@
#, c-format
msgid "E765: 'spellfile' does not have %ld entries"
-msgstr "E764: 'spellfile' har ikke %ld poster"
+msgstr "E765: 'spellfile' har ikke %ld poster"
#, c-format
msgid "Word removed from %s"
@@ -6168,7 +6168,7 @@
msgstr "E749: Tom buffer"
msgid "E682: Invalid search pattern or delimiter"
-msgstr "E683: Ugyldig søkestreng eller skilletegn"
+msgstr "E682: Ugyldig søkestreng eller skilletegn"
msgid "E139: File is loaded in another buffer"
msgstr "E139: Filen er lastet i en annen buffer"
diff --git a/src/po/zh_CN.cp936.po b/src/po/zh_CN.cp936.po
index 591839f..96b2527 100644
--- a/src/po/zh_CN.cp936.po
+++ b/src/po/zh_CN.cp936.po
@@ -1207,7 +1207,7 @@
msgid "Append File"
msgstr "×·¼ÓÎļþ"
-msgid "E747: Cannot change directory, buffer is modifed (add ! to override)"
+msgid "E747: Cannot change directory, buffer is modified (add ! to override)"
msgstr "E747: ²»ÄܸıäĿ¼£¬»º³åÇøÒÑÐÞ¸Ä (Çë¼Ó ! Ç¿ÖÆÖ´ÐÐ)"
msgid "E186: No previous directory"
diff --git a/src/popupmnu.c b/src/popupmnu.c
index 1d747a6..fcc7d85 100644
--- a/src/popupmnu.c
+++ b/src/popupmnu.c
@@ -56,7 +56,7 @@
int i;
int top_clear;
int row;
- int height;
+ int context_lines;
int col;
int above_row = cmdline_row;
int redo_count = 0;
@@ -73,8 +73,7 @@
validate_cursor_col();
pum_array = NULL;
- row = curwin->w_cline_row + W_WINROW(curwin);
- height = curwin->w_cline_height;
+ row = curwin->w_wrow + W_WINROW(curwin);
if (firstwin->w_p_pvw)
top_clear = firstwin->w_height;
@@ -99,19 +98,26 @@
/* Put the pum below "row" if possible. If there are few lines decide on
* where there is more room. */
- if (row >= above_row - pum_height
- && row > (above_row - top_clear - height) / 2)
+ if (row + 2 >= above_row - pum_height
+ && row > (above_row - top_clear) / 2)
{
/* pum above "row" */
- if (row >= size)
+
+ /* Leave two lines of context if possible */
+ if (curwin->w_wrow - curwin->w_cline_row >= 2)
+ context_lines = 2;
+ else
+ context_lines = curwin->w_wrow - curwin->w_cline_row;
+
+ if (row >= size + context_lines)
{
- pum_row = row - size;
+ pum_row = row - size - context_lines;
pum_height = size;
}
else
{
pum_row = 0;
- pum_height = row;
+ pum_height = row - context_lines;
}
if (p_ph > 0 && pum_height > p_ph)
{
@@ -122,7 +128,15 @@
else
{
/* pum below "row" */
- pum_row = row + height;
+
+ /* Leave two lines of context if possible */
+ if (curwin->w_cline_row + curwin->w_cline_height - curwin->w_wrow >= 3)
+ context_lines = 3;
+ else
+ context_lines = curwin->w_cline_row
+ + curwin->w_cline_height - curwin->w_wrow;
+
+ pum_row = row + context_lines;
if (size > above_row - pum_row)
pum_height = above_row - pum_row;
else
diff --git a/src/proto/os_unix.pro b/src/proto/os_unix.pro
index 735565a..36193bb 100644
--- a/src/proto/os_unix.pro
+++ b/src/proto/os_unix.pro
@@ -19,6 +19,7 @@
void mch_settitle __ARGS((char_u *title, char_u *icon));
void mch_restore_title __ARGS((int which));
int vim_is_xterm __ARGS((char_u *name));
+int use_xterm_like_mouse __ARGS((char_u *name));
int use_xterm_mouse __ARGS((void));
int vim_is_iris __ARGS((char_u *name));
int vim_is_vt300 __ARGS((char_u *name));
diff --git a/src/structs.h b/src/structs.h
index d6a8f72..31c3dfc 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -1005,6 +1005,7 @@
#else
typedef int varnumber_T;
#endif
+typedef double float_T;
typedef struct listvar_S list_T;
typedef struct dictvar_S dict_T;
@@ -1019,6 +1020,9 @@
union
{
varnumber_T v_number; /* number value */
+#ifdef FEAT_FLOAT
+ float_T v_float; /* floating number value */
+#endif
char_u *v_string; /* string value (can be NULL!) */
list_T *v_list; /* list value (can be NULL!) */
dict_T *v_dict; /* dict value (can be NULL!) */
@@ -1032,6 +1036,7 @@
#define VAR_FUNC 3 /* "v_string" is function name */
#define VAR_LIST 4 /* "v_list" is used */
#define VAR_DICT 5 /* "v_dict" is used */
+#define VAR_FLOAT 6 /* "v_float" is used */
/* Values for "v_lock". */
#define VAR_LOCKED 1 /* locked with lock(), can use unlock() */
diff --git a/src/vim.rc b/src/vim.rc
index affdb9a..e9ecd64 100644
--- a/src/vim.rc
+++ b/src/vim.rc
@@ -52,7 +52,7 @@
// Type Library
//
#ifdef FEAT_OLE
- 1 TYPELIB "VIM.TLB"
+ 1 TYPELIB "vim.tlb"
#endif
//
@@ -91,7 +91,7 @@
VALUE "FileDescription", "Vi Improved - A Text Editor\0"
VALUE "FileVersion", VIM_VERSION_MAJOR_STR ", " VIM_VERSION_MINOR_STR ", " VIM_VERSION_BUILD_STR ", " VIM_VERSION_PATCHLEVEL_STR "\0"
VALUE "InternalName", "VIM\0"
- VALUE "LegalCopyright", "Copyright \251 1996-2005\0"
+ VALUE "LegalCopyright", "Copyright \251 1996-2008\0"
VALUE "LegalTrademarks", "Vim\0"
VALUE "OriginalFilename", "VIM.EXE\0"
VALUE "ProductName", "Vim\0"