updated for version 7.0193
diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt
index 8735b5c..bc55a61 100644
--- a/runtime/doc/autocmd.txt
+++ b/runtime/doc/autocmd.txt
@@ -620,11 +620,12 @@
c Commmand line
*QuickFixCmdPre*
QuickFixCmdPre Before a quickfix command is run (|:make|,
- |:grep|, |:grepadd|, |:vimgrep|,
- |:vimgrepadd|). The pattern is matched against
- the command being run. When |:grep| is used
- but 'grepprg' is set to "internal" it still
- matches "grep".
+ |:lmake|, |:grep|, |:lgrep|, |:grepadd|,
+ |:lgrepadd|, |:vimgrep|, |:lvimgrep|,
+ |:vimgrepadd|, |:vimgrepadd|). The pattern is
+ matched against the command being run. When
+ |:grep| is used but 'grepprg' is set to
+ "internal" it still matches "grep".
This command cannot be used to set the
'makeprg' and 'grepprg' variables.
If this command causes an error, the quickfix
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 9bd3660..2592850 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -2943,7 +2943,8 @@
also work well with a single file: >
:set grepprg=grep\ -nH
< Special value: When 'grepprg' is set to "internal" the |:grep| command
- works like |:vimgrep| and |:grepadd| like |:vimgrepadd|.
+ works like |:vimgrep|, |:lgrep| like |:lvimgrep|, |:grepadd| like
+ |:vimgrepadd| and |:lgrepadd| like |:lvimgrepadd|.
See also the section |:make_makeprg|, since most of the comments there
apply equally to 'grepprg'.
For Win32, the default is "findstr /n" if "findstr.exe" can be found,
diff --git a/runtime/doc/tags b/runtime/doc/tags
index bbb9190..4d69b87 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -1788,6 +1788,8 @@
:cabc map.txt /*:cabc*
:cabclear map.txt /*:cabclear*
:cad quickfix.txt /*:cad*
+:caddb quickfix.txt /*:caddb*
+:caddbuffer quickfix.txt /*:caddbuffer*
:caddexpr quickfix.txt /*:caddexpr*
:caddf quickfix.txt /*:caddf*
:caddfile quickfix.txt /*:caddfile*
@@ -2105,6 +2107,8 @@
:lNfile quickfix.txt /*:lNfile*
:la editing.txt /*:la*
:lad quickfix.txt /*:lad*
+:laddb quickfix.txt /*:laddb*
+:laddbuffer quickfix.txt /*:laddbuffer*
:laddexpr quickfix.txt /*:laddexpr*
:laddf quickfix.txt /*:laddf*
:laddfile quickfix.txt /*:laddfile*
@@ -2143,6 +2147,10 @@
:lfirst quickfix.txt /*:lfirst*
:lg quickfix.txt /*:lg*
:lgetfile quickfix.txt /*:lgetfile*
+:lgr quickfix.txt /*:lgr*
+:lgrep quickfix.txt /*:lgrep*
+:lgrepa quickfix.txt /*:lgrepa*
+:lgrepadd quickfix.txt /*:lgrepadd*
:list various.txt /*:list*
:ll quickfix.txt /*:ll*
:lla quickfix.txt /*:lla*
@@ -2150,6 +2158,8 @@
:lli quickfix.txt /*:lli*
:llist quickfix.txt /*:llist*
:lm map.txt /*:lm*
+:lmak quickfix.txt /*:lmak*
+:lmake quickfix.txt /*:lmake*
:lmap map.txt /*:lmap*
:lmap_l map.txt /*:lmap_l*
:lmapc map.txt /*:lmapc*
@@ -2185,6 +2195,10 @@
:ltag tagsrch.txt /*:ltag*
:lu map.txt /*:lu*
:lunmap map.txt /*:lunmap*
+:lv quickfix.txt /*:lv*
+:lvimgrep quickfix.txt /*:lvimgrep*
+:lvimgrepa quickfix.txt /*:lvimgrepa*
+:lvimgrepadd quickfix.txt /*:lvimgrepadd*
:lw quickfix.txt /*:lw*
:lwindow quickfix.txt /*:lwindow*
:m change.txt /*:m*
@@ -5406,6 +5420,7 @@
hebrew.txt hebrew.txt /*hebrew.txt*
help various.txt /*help*
help-context help.txt /*help-context*
+help-tags tags 1
help-translated various.txt /*help-translated*
help-xterm-window various.txt /*help-xterm-window*
help.txt help.txt /*help.txt*
diff --git a/runtime/lang/menu_ja_jp.euc-jp.vim b/runtime/lang/menu_ja_jp.euc-jp.vim
index 06be3ff..38a65bf 100644
--- 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@tka.att.ne.jp>
-" Last Change: 29-Apr-2004.
+" Last Change: 04-Feb-2006.
" Quit when menu translations have already been done.
if exists("did_menu_trans")
@@ -142,7 +142,23 @@
menutrans &Close<Tab>:cclose ÊĤ¸¤ë(&C)<Tab>:cclose
menutrans &Convert\ to\ HEX<Tab>:%!xxd HEX¤ØÊÑ´¹(&C)<Tab>:%!xxd
menutrans Conve&rt\ back<Tab>:%!xxd\ -r HEX¤«¤éµÕÊÑ´¹(&R)<Tab>%!xxd\ -r
-menutrans &Set\ Compiler ¥³¥ó¥Ñ¥¤¥éÀßÄê(&S)
+menutrans Se&T\ Compiler ¥³¥ó¥Ñ¥¤¥éÀßÄê(&T)
+
+" Tools.Spelling Menu
+menutrans &Spelling ¥¹¥Ú¥ê¥ó¥°(&S)
+menutrans &Spell\ Check\ On ¥¹¥Ú¥ë¥Á¥§¥Ã¥¯Í¸ú(&S)
+menutrans Spell\ Check\ &Off ¥¹¥Ú¥ë¥Á¥§¥Ã¥¯Í¸ú(&O)
+menutrans To\ &Next\ error<Tab>]s ¼¡¤Î¥¨¥é¡¼(&N)<Tab>]s
+menutrans To\ &Previous\ error<Tab>[s Á°¤Î¥¨¥é¡¼(&P)<Tab>[s
+menutrans Suggest\ &Corrections<Tab>z? ½¤Àµ¸õÊä(&C)<Tab>z?
+menutrans &Repeat\ correction<Tab>:spellrepall ½¤Àµ¤ò·«¤êÊÖ¤¹(&R)<Tab>:spellrepall
+menutrans Set\ language\ to\ "en" ¸À¸ì¤ò\ "en"\ ¤ËÀßÄꤹ¤ë
+menutrans Set\ language\ to\ "en_au" ¸À¸ì¤ò\ "en_au"\ ¤ËÀßÄꤹ¤ë
+menutrans Set\ language\ to\ "en_ca" ¸À¸ì¤ò\ "en_ca"\ ¤ËÀßÄꤹ¤ë
+menutrans Set\ language\ to\ "en_gb" ¸À¸ì¤ò\ "en_gb"\ ¤ËÀßÄꤹ¤ë
+menutrans Set\ language\ to\ "en_nz" ¸À¸ì¤ò\ "en_nz"\ ¤ËÀßÄꤹ¤ë
+menutrans Set\ language\ to\ "en_us" ¸À¸ì¤ò\ "en_us"\ ¤ËÀßÄꤹ¤ë
+menutrans &Find\ More\ Languages ¾¤Î¸À¸ì¤ò¸¡º÷¤¹¤ë(&F)
" Tools.Fold Menu
menutrans &Folding ÀÞ¾ö¤ß(&F)
diff --git a/runtime/lang/menu_japanese_japan.932.vim b/runtime/lang/menu_japanese_japan.932.vim
index 3fa21b6..7041f29 100644
--- 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@tka.att.ne.jp>
-" Last Change: 29-Apr-2004.
+" Last Change: 04-Feb-2006.
" Quit when menu translations have already been done.
if exists("did_menu_trans")
@@ -142,7 +142,23 @@
menutrans &Close<Tab>:cclose 妎(&C)<Tab>:cclose
menutrans &Convert\ to\ HEX<Tab>:%!xxd HEXÖÏ·(&C)<Tab>:%!xxd
menutrans Conve&rt\ back<Tab>:%!xxd\ -r HEX©çtÏ·(&R)<Tab>%!xxd\ -r
-menutrans &Set\ Compiler RpCÝè(&S)
+menutrans Se&T\ Compiler RpCÝè(&T)
+
+" Tools.Spelling Menu
+menutrans &Spelling XyO(&S)
+menutrans &Spell\ Check\ On Xy`FbNLø(&S)
+menutrans Spell\ Check\ &Off Xy`FbNLø(&O)
+menutrans To\ &Next\ error<Tab>]s ÌG[(&N)<Tab>]s
+menutrans To\ &Previous\ error<Tab>[s OÌG[(&P)<Tab>[s
+menutrans Suggest\ &Corrections<Tab>z? C³óâ(&C)<Tab>z?
+menutrans &Repeat\ correction<Tab>:spellrepall C³ðJèÔ·(&R)<Tab>:spellrepall
+menutrans Set\ language\ to\ "en" ¾êð\ "en"\ ÉÝè·é
+menutrans Set\ language\ to\ "en_au" ¾êð\ "en_au"\ ÉÝè·é
+menutrans Set\ language\ to\ "en_ca" ¾êð\ "en_ca"\ ÉÝè·é
+menutrans Set\ language\ to\ "en_gb" ¾êð\ "en_gb"\ ÉÝè·é
+menutrans Set\ language\ to\ "en_nz" ¾êð\ "en_nz"\ ÉÝè·é
+menutrans Set\ language\ to\ "en_us" ¾êð\ "en_us"\ ÉÝè·é
+menutrans &Find\ More\ Languages ¼Ì¾êðõ·é(&F)
" Tools.Fold Menu
menutrans &Folding ÜôÝ(&F)
diff --git a/runtime/syntax/gnuplot.vim b/runtime/syntax/gnuplot.vim
index a6fa716..5a381c7 100644
--- a/runtime/syntax/gnuplot.vim
+++ b/runtime/syntax/gnuplot.vim
@@ -138,7 +138,7 @@
syn keyword gnuplotType line[s] linesp[oints] points poiinttype sbezier splines steps
" w lt lw ls = optional
syn keyword gnuplotType vectors xerr[orbars] xyerr[orbars] yerr[orbars] financebars candlesticks vector
-syn keyword gnuplotType errorb[ars surface
+syn keyword gnuplotType errorb[ars] surface
syn keyword gnuplotType filledcurve[s] pm3d x1 x2 y1 y2 xy closed
syn keyword gnuplotType at pi front
syn keyword gnuplotType errorlines xerrorlines yerrorlines xyerrorlines
diff --git a/src/edit.c b/src/edit.c
index f384229..ee574ad 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -87,6 +87,14 @@
static compl_T *compl_curr_match = NULL;
static compl_T *compl_shown_match = NULL;
+/* When "compl_leader" is not NULL only matches that start with this string
+ * are used. */
+static char_u *compl_leader = NULL;
+
+static int compl_used_match; /* Selected one of the matches. When
+ FALSE the match was edited or using
+ the longest common string. */
+
/* When the first completion is done "compl_started" is set. When it's
* FALSE the word to be completed must be located. */
static int compl_started = FALSE;
@@ -112,9 +120,12 @@
static void ins_compl_upd_pum __ARGS((void));
static void ins_compl_del_pum __ARGS((void));
static int pum_wanted __ARGS((void));
+static int pum_two_or_more __ARGS((void));
static void ins_compl_dictionaries __ARGS((char_u *dict, char_u *pat, int dir, int flags, int thesaurus));
static void ins_compl_free __ARGS((void));
static void ins_compl_clear __ARGS((void));
+static int ins_compl_bs __ARGS((void));
+static void ins_compl_addleader __ARGS((int c));
static int ins_compl_prep __ARGS((int c));
static buf_T *ins_compl_next_buf __ARGS((buf_T *buf, int flag));
static int ins_compl_get_exp __ARGS((pos_T *ini, int dir));
@@ -673,13 +684,26 @@
if (c == K_DOWN && pum_visible())
c = Ctrl_N;
+ /* When using BS while the popup menu is wanted and still after the
+ * character where completion started: Change the subset of matches to
+ * what matches "compl_leader". */
+ if (compl_started && pum_wanted() && curwin->w_cursor.col > compl_col)
+ {
+ if ((c == K_BS || c == Ctrl_H) && ins_compl_bs())
+ continue;
+
+ /* Editing the word. */
+ if (!compl_used_match && vim_isprintc(c))
+ {
+ ins_compl_addleader(c);
+ continue;
+ }
+ }
+
/* Prepare for or stop CTRL-X mode. This doesn't do completion, but
* it does fix up the text when finishing completion. */
- if (c != K_IGNORE)
- {
- if (ins_compl_prep(c))
- continue;
- }
+ if (c != K_IGNORE && ins_compl_prep(c))
+ continue;
#endif
/* CTRL-\ CTRL-N goes to Normal mode,
@@ -2159,9 +2183,6 @@
static int
pum_wanted()
{
- compl_T *compl;
- int i;
-
/* 'completeopt' must contain "menu" */
if (*p_cot == NUL)
return FALSE;
@@ -2173,6 +2194,17 @@
#endif
)
return FALSE;
+ return TRUE;
+}
+
+/*
+ * Return TRUE if there are two or more matches to be shown in the popup menu.
+ */
+ static int
+pum_two_or_more()
+{
+ compl_T *compl;
+ int i;
/* Don't display the popup menu if there are no matches or there is only
* one (ignoring the original text). */
@@ -2199,8 +2231,9 @@
int i;
int cur = -1;
colnr_T col;
+ int lead_len = 0;
- if (!pum_wanted())
+ if (!pum_wanted() || !pum_two_or_more())
return;
/* Update the screen before drawing the popup menu over it. */
@@ -2211,12 +2244,18 @@
/* Need to build the popup menu list. */
compl_match_arraysize = 0;
compl = compl_first_match;
+ if (compl_leader != NULL)
+ lead_len = STRLEN(compl_leader);
do
{
- if ((compl->cp_flags & ORIGINAL_TEXT) == 0)
+ if ((compl->cp_flags & ORIGINAL_TEXT) == 0
+ && (compl_leader == NULL
+ || STRNCMP(compl->cp_str, compl_leader, lead_len) == 0))
++compl_match_arraysize;
compl = compl->cp_next;
} while (compl != NULL && compl != compl_first_match);
+ if (compl_match_arraysize == 0)
+ return;
compl_match_array = (char_u **)alloc((unsigned)(sizeof(char_u **)
* compl_match_arraysize));
if (compl_match_array != NULL)
@@ -2225,7 +2264,10 @@
compl = compl_first_match;
do
{
- if ((compl->cp_flags & ORIGINAL_TEXT) == 0)
+ if ((compl->cp_flags & ORIGINAL_TEXT) == 0
+ && (compl_leader == NULL
+ || STRNCMP(compl->cp_str, compl_leader,
+ lead_len) == 0))
{
if (compl == compl_shown_match)
cur = i;
@@ -2238,21 +2280,10 @@
else
{
/* popup menu already exists, only need to find the current item.*/
- i = 0;
- compl = compl_first_match;
- do
- {
- if ((compl->cp_flags & ORIGINAL_TEXT) == 0)
- {
- if (compl == compl_shown_match)
- {
- cur = i;
- break;
- }
- ++i;
- }
- compl = compl->cp_next;
- } while (compl != NULL && compl != compl_first_match);
+ for (i = 0; i < compl_match_arraysize; ++i)
+ if (compl_match_array[i] == compl_shown_match->cp_str)
+ break;
+ cur = i;
}
if (compl_match_array != NULL)
@@ -2472,6 +2503,8 @@
vim_free(compl_pattern);
compl_pattern = NULL;
+ vim_free(compl_leader);
+ compl_leader = NULL;
if (compl_first_match == NULL)
return;
@@ -2501,11 +2534,102 @@
compl_matches = 0;
vim_free(compl_pattern);
compl_pattern = NULL;
+ vim_free(compl_leader);
+ compl_leader = NULL;
save_sm = -1;
edit_submode_extra = NULL;
}
/*
+ * Delete one character before the cursor and make a subset of the matches
+ * that match now.
+ * Returns TRUE if the work is done and another char to be got from the user.
+ */
+ static int
+ins_compl_bs()
+{
+ char_u *line;
+ char_u *p;
+
+ if (curwin->w_cursor.col <= compl_col + compl_length)
+ {
+ /* Deleted more than what was used to find matches, need to look for
+ * matches all over again. */
+ ins_compl_free();
+ compl_started = FALSE;
+ compl_matches = 0;
+ }
+
+ line = ml_get_curline();
+ p = line + curwin->w_cursor.col;
+ mb_ptr_back(line, p);
+
+ vim_free(compl_leader);
+ compl_leader = vim_strnsave(line + compl_col, (p - line) - compl_col);
+ if (compl_leader != NULL)
+ {
+ ins_compl_del_pum();
+ ins_compl_delete();
+ ins_bytes(compl_leader + curwin->w_cursor.col - compl_col);
+
+ if (!compl_started)
+ {
+ /* Matches were cleared, need to search for them now. */
+ if (ins_complete(Ctrl_N) == FAIL)
+ compl_cont_status = 0;
+ else
+ {
+ /* Remove the completed word again. */
+ ins_compl_delete();
+ ins_bytes(compl_leader + curwin->w_cursor.col - compl_col);
+ }
+ }
+
+ /* Show the popup menu with a different set of matches. */
+ ins_compl_show_pum();
+ compl_used_match = FALSE;
+
+ return TRUE;
+ }
+ return FALSE;
+}
+
+/*
+ * Append one character to the match leader. May reduce the number of
+ * matches.
+ */
+ static void
+ins_compl_addleader(c)
+ int c;
+{
+#ifdef FEAT_MBYTE
+ int cc;
+
+ if (has_mbyte && (cc = (*mb_char2len)(c)) > 1)
+ {
+ char_u buf[MB_MAXBYTES + 1];
+
+ (*mb_char2bytes)(c, buf);
+ buf[cc] = NUL;
+ ins_char_bytes(buf, cc);
+ }
+ else
+#endif
+ ins_char(c);
+
+ vim_free(compl_leader);
+ compl_leader = vim_strnsave(ml_get_curline() + compl_col,
+ curwin->w_cursor.col - compl_col);
+ if (compl_leader != NULL)
+ {
+ /* Show the popup menu with a different set of matches. */
+ ins_compl_del_pum();
+ ins_compl_show_pum();
+ compl_used_match = FALSE;
+ }
+}
+
+/*
* Prepare for Insert mode completion, or stop it.
* Called just after typing a character in Insert mode.
* Returns TRUE when the character is not to be inserted;
@@ -3290,6 +3414,7 @@
ins_compl_insert()
{
ins_bytes(compl_shown_match->cp_str + curwin->w_cursor.col - compl_col);
+ compl_used_match = TRUE;
}
/*
@@ -3317,6 +3442,8 @@
int num_matches = -1;
int i;
int todo = count;
+ compl_T *found_compl = NULL;
+ int found_end = FALSE;
if (allow_get_expansion)
{
@@ -3332,32 +3459,46 @@
if (compl_shows_dir == FORWARD && compl_shown_match->cp_next != NULL)
{
compl_shown_match = compl_shown_match->cp_next;
- if (compl_shown_match->cp_next != NULL
- && compl_shown_match->cp_next == compl_first_match)
- break;
+ found_end = (compl_first_match != NULL
+ && (compl_shown_match->cp_next == compl_first_match
+ || compl_shown_match == compl_first_match));
}
else if (compl_shows_dir == BACKWARD
&& compl_shown_match->cp_prev != NULL)
{
+ found_end = (compl_shown_match == compl_first_match);
compl_shown_match = compl_shown_match->cp_prev;
- if (compl_shown_match == compl_first_match)
- break;
+ found_end |= (compl_shown_match == compl_first_match);
}
else
{
compl_pending = TRUE;
- if (allow_get_expansion)
- {
- num_matches = ins_compl_get_exp(&compl_startpos,
- compl_direction);
- if (compl_pending)
- {
- if (compl_direction == compl_shows_dir)
- compl_shown_match = compl_curr_match;
- }
- }
- else
+ if (!allow_get_expansion)
return -1;
+
+ num_matches = ins_compl_get_exp(&compl_startpos, compl_direction);
+ if (compl_pending && compl_direction == compl_shows_dir)
+ compl_shown_match = compl_curr_match;
+ found_end = FALSE;
+ }
+ if ((compl_shown_match->cp_flags & ORIGINAL_TEXT) == 0
+ && compl_leader != NULL
+ && STRNCMP(compl_shown_match->cp_str,
+ compl_leader, STRLEN(compl_leader)) != 0)
+ ++todo;
+ else
+ /* Remember a matching item. */
+ found_compl = compl_shown_match;
+
+ /* Stop at the end of the list when we found a usable match. */
+ if (found_end)
+ {
+ if (found_compl != NULL)
+ {
+ compl_shown_match = found_compl;
+ break;
+ }
+ todo = 1; /* use first usable match after wrapping around */
}
}
diff --git a/src/globals.h b/src/globals.h
index 82c42b2..83b6267 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -105,8 +105,8 @@
* Variables for Insert mode completion.
*/
-/* length of the text being completed (this is deleted to be replaced by the
- * match) */
+/* Length in bytes of the text being completed (this is deleted to be replaced
+ * by the match.) */
EXTERN int compl_length INIT(= 0);
/* Set when character typed while looking for matches and it means we should
diff --git a/src/po/ja.sjis.po b/src/po/ja.sjis.po
index e47aee8..56a4a63 100644
--- a/src/po/ja.sjis.po
+++ b/src/po/ja.sjis.po
@@ -3,14 +3,14 @@
# 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-5.
-# Last Change: 05-Mar-2005.
+# MURAOKA Taro <koron@tka.att.ne.jp>, 2001-6.
+# Last Change: 05-Feb-2006.
#
msgid ""
msgstr ""
"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"
+"POT-Creation-Date: 2006-02-04 22:44+0900\n"
+"PO-Revision-Date: 2006-02-05 00:10+0900\n"
"Last-Translator: MURAOKA Taro <koron@tka.att.ne.jp>\n"
"Language-Team: MURAOKA Taro <koron@tka.att.ne.jp>\n"
"MIME-Version: 1.0\n"
@@ -152,6 +152,9 @@
"\n"
"# obt@Xg:\n"
+msgid "[Location List]"
+msgstr "[êXg]"
+
msgid "[Error List]"
msgstr "[G[Xg]"
@@ -214,13 +217,8 @@
msgstr " L[[hâ® (^N^P)"
#. ctrl_x_mode == 0, ^P/^N compl.
-msgid " ^X mode (^E^Y^L^]^F^I^K^D^U^V^N^P)"
-msgstr " ^X [h (^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
-msgid " Keyword Local completion (^N^P)"
-msgstr " ÇL[[hâ® (^N^P)"
+msgid " ^X mode (^]^D^E^F^I^K^L^N^O^P^S^U^V^Y)"
+msgstr " ^X [h (^]^D^E^F^I^K^L^N^O^P^S^U^V^Y)"
msgid " Whole line completion (^L^N^P)"
msgstr " s(SÌ)â® (^L^N^P)"
@@ -249,15 +247,24 @@
msgid " User defined completion (^U^N^P)"
msgstr " [Uè`â® (^U^N^P)"
+msgid " Omni completion (^O^N^P)"
+msgstr " Ijâ® (^O^N^P)"
+
+msgid " Spelling suggestion (^S^N^P)"
+msgstr " ÔèC³óâ (^S^N^P)"
+
+msgid " Keyword Local completion (^N^P)"
+msgstr " ÇL[[hâ® (^N^P)"
+
msgid "Hit end of paragraph"
msgstr "iÌÅãÉqbg"
-msgid "'thesaurus' option is empty"
-msgstr "'thesaurus' IvVªóÅ·"
-
msgid "'dictionary' option is empty"
msgstr "'dictionary' IvVªóÅ·"
+msgid "'thesaurus' option is empty"
+msgstr "'thesaurus' IvVªóÅ·"
+
#, c-format
msgid "Scanning dictionary: %s"
msgstr "«ðXL: %s"
@@ -321,7 +328,7 @@
msgstr "E686: %s ÌøÍXg^ÅȯêÎÈèܹñ"
#, c-format
-msgid "E712: Argument of %s must be a List or Dictionaary"
+msgid "E712: Argument of %s must be a List or Dictionary"
msgstr "E712: %s ÌøÍXg^ܽͫ^ÅȯêÎÈèܹñ"
msgid "E713: Cannot use empty key for Dictionary"
@@ -362,6 +369,10 @@
msgid "E130: Unknown function: %s"
msgstr "E130: ¢mÌÖÅ·: %s"
+#, c-format
+msgid "E461: Illegal variable name: %s"
+msgstr "E461: s³Èϼŷ: %s"
+
msgid "E687: Less targets than List items"
msgstr "E687: ^[QbgªXg^àÌvfæèàȢŷ"
@@ -460,8 +471,9 @@
msgid "E720: Missing colon in Dictionary: %s"
msgstr "E720: «^ÉRª èܹñ: %s"
-msgid "E721: Duplicate key in Dictionary"
-msgstr "E721: «^Éd¡L[ª»ñ´¢µÜ·"
+#, c-format
+msgid "E721: Duplicate key in Dictionary: \"%s\""
+msgstr "E721: «^Éd¡L[ª èÜ·: \"%s\""
#, c-format
msgid "E722: Missing comma in Dictionary: %s"
@@ -571,12 +583,8 @@
msgstr "E704: ÖQÆ^ϼÍå¶ÅnÜçȯêÎÈèܹñ: %s"
#, c-format
-msgid "705: Variable name conflicts with existing function: %s"
-msgstr "705: ϼªù¶ÌÖ¼ÆÕ˵ܷ: %s"
-
-#, c-format
-msgid "E461: Illegal variable name: %s"
-msgstr "E461: s³Èϼŷ: %s"
+msgid "E705: Variable name conflicts with existing function: %s"
+msgstr "E705: ϼªù¶ÌÖ¼ÆÕ˵ܷ: %s"
#, c-format
msgid "E706: Variable type mismatch for: %s"
@@ -625,7 +633,6 @@
msgid "E132: Function call depth is higher than 'maxfuncdepth'"
msgstr "E132: ÖÄoÌüêqª 'maxfuncdepth' ð´¦Üµ½"
-#. always scroll up, don't overwrite
#, c-format
msgid "calling %s"
msgstr "%s ðÀsÅ·"
@@ -642,7 +649,6 @@
msgid "%s returning %s"
msgstr "%s ª %s ðԵܵ½"
-#. always scroll up, don't overwrite
#, c-format
msgid "continuing in %s"
msgstr "%s ÌÀsðp±Å·"
@@ -657,6 +663,13 @@
"\n"
"# O[oÏ:\n"
+msgid ""
+"\n"
+"\tLast set from "
+msgstr ""
+"\n"
+"\tLast set from "
+
#, c-format
msgid "<%s>%s%s %d, Hex %02x, Octal %03o"
msgstr "<%s>%s%s %d, 16i %02x, 8i %03o"
@@ -742,11 +755,6 @@
msgid "Save As"
msgstr "ʼÅÛ¶"
-#. Overwriting a file that is loaded in another buffer is not a
-#. * good idea.
-msgid "E139: File is loaded in another buffer"
-msgstr "E139: ¯¶¼OÌt@Cª¼Ìobt@ÅÇÜêĢܷ"
-
msgid "Write partial file?"
msgstr "t@CðªIÉÛ¶µÜ·©?"
@@ -754,8 +762,16 @@
msgstr "E140: obt@ðªIÉÛ¶·éÉÍ ! ðgÁľ³¢"
#, c-format
-msgid "Overwrite existing file \"%.*s\"?"
-msgstr "ù¶Ìt@C \"%.*s\" ð㫵ܷ©?"
+msgid "Overwrite existing file \"%s\"?"
+msgstr "ù¶Ìt@C \"%s\" ð㫵ܷ©?"
+
+#, c-format
+msgid "Swap file \"%s\" exists, overwrite anyway?"
+msgstr "Xbvt@C \"%s\" ª¶ÝµÜ·. ã«ð§µÜ·©?"
+
+#, c-format
+msgid "E768: Swap file exists: %s (:silent! overrides)"
+msgstr "E768: Xbvt@Cª¶ÝµÜ·: %s (:silent! ðÇÁÅã)"
#, c-format
msgid "E141: No file name for buffer %ld"
@@ -766,11 +782,11 @@
#, c-format
msgid ""
-"'readonly' option is set for \"%.*s\".\n"
+"'readonly' option is set for \"%s\".\n"
"Do you wish to write anyway?"
msgstr ""
-"\"%.*s\" ÉÍ 'readonly' IvVªÝè³êĢܷ\n"
-"§IÉ㫵ܷ©?"
+"\"%s\" ÉÍ 'readonly' IvVªÝè³êĢܷ.\n"
+"㫧ðµÜ·©?"
msgid "Edit File"
msgstr "t@CðÒW"
@@ -940,8 +956,8 @@
msgstr "E750: ßÉ :profile start <fname> ðÀsµÄ¾³¢"
#, c-format
-msgid "Save changes to \"%.*s\"?"
-msgstr "ÏXð \"%.*s\" ÉÛ¶µÜ·©?"
+msgid "Save changes to \"%s\"?"
+msgstr "ÏXð \"%s\" ÉÛ¶µÜ·©?"
msgid "Untitled"
msgstr "³è"
@@ -1015,90 +1031,6 @@
msgstr "E168: :finish ªæXNvgÈOÅgp³êܵ½"
#, c-format
-msgid "Page %d"
-msgstr "%d y[W"
-
-msgid "No text to be printed"
-msgstr "óü·éeLXgª èܹñ"
-
-msgid "Printing page %d (%d%%)"
-msgstr "óü: y[W %d (%d%%)"
-
-#, c-format
-msgid " Copy %d of %d"
-msgstr " Rs[ %d (S %d )"
-
-#, c-format
-msgid "Printed: %s"
-msgstr "óüµÜµ½: %s"
-
-msgid "Printing aborted"
-msgstr "óüª~³êܵ½"
-
-msgid "E455: Error writing to PostScript output file"
-msgstr "E455: PostScriptoÍt@CÌÝG[Å·"
-
-#, c-format
-msgid "E624: Can't open file \"%s\""
-msgstr "E624: t@C \"%s\" ðJ¯Ü¹ñ"
-
-#, c-format
-msgid "E457: Can't read PostScript resource file \"%s\""
-msgstr "E457: PostScriptÌ\\[Xt@C \"%s\" ðÇßܹñ"
-
-#, c-format
-msgid "E618: file \"%s\" is not a PostScript resource file"
-msgstr "E618: t@C \"%s\" Í PostScript \\[Xt@CÅÍ èܹñ"
-
-#, c-format
-msgid "E619: file \"%s\" is not a supported PostScript resource file"
-msgstr "E619: t@C \"%s\" ÍεĢȢ PostScript \\[Xt@CÅ·"
-
-#, c-format
-msgid "E621: \"%s\" resource file has wrong version"
-msgstr "E621: \\[Xt@C \"%s\" Ío[WªÙÈèÜ·"
-
-msgid "E673: Incompatible multi-byte encoding and character set."
-msgstr "E673: Ý·«Ì³¢}`oCgGR[fBOƶZbgÅ·"
-
-msgid "E674: printmbcharset cannot be empty with multi-byte encoding."
-msgstr "E674: }`oCgGR[fBOÅÍ printmbcharset ðóÉūܹñ"
-
-msgid "E675: No default font specfifed for multi-byte printing."
-msgstr ""
-"E675: }`oCg¶ðóü·é½ßÌftHgtHgªwè³êĢܹñ"
-
-msgid "E324: Can't open PostScript output file"
-msgstr "E324: PostScriptoÍpÌt@CðJ¯Ü¹ñ"
-
-#, c-format
-msgid "E456: Can't open file \"%s\""
-msgstr "E456: t@C \"%s\" ðJ¯Ü¹ñ"
-
-msgid "E456: Can't find PostScript resource file \"prolog.ps\""
-msgstr "E456: PostScriptÌ\\[Xt@C \"prolog.ps\" ªÝ©èܹñ"
-
-msgid "E456: Can't find PostScript resource file \"cidfont.ps\""
-msgstr "E456: PostScriptÌ\\[Xt@C \"cidfont.ps\" ªÝ©èܹñ"
-
-#, c-format
-msgid "E456: Can't find PostScript resource file \"%s.ps\""
-msgstr "E456: PostScriptÌ\\[Xt@C \"%s.ps\" ªÝ©èܹñ"
-
-#, c-format
-msgid "E620: Unable to convert to print encoding \"%s\""
-msgstr "E620: óüGR[h \"%s\" ÖϷūܹñ"
-
-msgid "Sending to printer..."
-msgstr "v^ÉM..."
-
-msgid "E365: Failed to print PostScript file"
-msgstr "E365: PostScriptt@CÌóüɸsµÜµ½"
-
-msgid "Print job sent."
-msgstr "óüWuðMµÜµ½."
-
-#, c-format
msgid "Current %slanguage: \"%s\""
msgstr "»ÝÌ %s¾ê: \"%s\""
@@ -1185,18 +1117,8 @@
msgid "E178: Invalid default value for count"
msgstr "E178: JEgÌȪlª³øÅ·"
-msgid "E179: argument required for complete"
-msgstr "E179: â®Ì½ßÌøªKvÅ·"
-
-#, c-format
-msgid "E180: Invalid complete value: %s"
-msgstr "E180: ³øÈâ®wèÅ·: %s"
-
-msgid "E468: Completion argument only allowed for custom completion"
-msgstr "E468: â®øÍJX^â®Åµ©gpūܹñ"
-
-msgid "E467: Custom completion requires a function argument"
-msgstr "E467: JX^â®ÉÍøƵÄÖªKvÅ·"
+msgid "E179: argument required for -complete"
+msgstr "E179: -â®Ì½ßÌøªKvÅ·"
#, c-format
msgid "E181: Invalid attribute: %s"
@@ -1213,6 +1135,16 @@
msgstr "E184: »Ì[Uè`R}hÍ èܹñ: %s"
#, c-format
+msgid "E180: Invalid complete value: %s"
+msgstr "E180: ³øÈâ®wèÅ·: %s"
+
+msgid "E468: Completion argument only allowed for custom completion"
+msgstr "E468: â®øÍJX^â®Åµ©gpūܹñ"
+
+msgid "E467: Custom completion requires a function argument"
+msgstr "E467: JX^â®ÉÍøƵÄÖªKvÅ·"
+
+#, c-format
msgid "E185: Cannot find color scheme %s"
msgstr "E185: J[XL[ %s ªÝ©èܹñ"
@@ -1467,6 +1399,12 @@
msgid "[New File]"
msgstr "[Vt@C]"
+msgid "[New DIRECTORY]"
+msgstr "[VKfBNg]"
+
+msgid "[File too big]"
+msgstr "[t@Cßå]"
+
msgid "[Permission Denied]"
msgstr "[Fª èܹñ]"
@@ -1516,8 +1454,9 @@
msgid "[crypted]"
msgstr "[û]"
-msgid "[CONVERSION ERROR]"
-msgstr "[Ï·G[]"
+#, c-format
+msgid "[CONVERSION ERROR in line %ld]"
+msgstr "[%ld sÚÅÏ·G[]"
#, c-format
msgid "[ILLEGAL BYTE in line %ld]"
@@ -1703,8 +1642,8 @@
msgstr "E246: autocommand Ì FileChangedShell ªobt@ðíµÜµ½"
#, c-format
-msgid "E211: Warning: File \"%s\" no longer available"
-msgstr "E211: x: t@C \"%s\" Íùɶݵܹñ"
+msgid "E211: File \"%s\" no longer available"
+msgstr "E211: t@C \"%s\" Íùɶݵܹñ"
#, c-format
msgid ""
@@ -1712,21 +1651,27 @@
"well"
msgstr "W12: x: t@C \"%s\" ªÏX³êVimÌobt@àÏX³êܵ½"
+msgid "See \":help W12\" for more info."
+msgstr "Ú×Í \":help W12\" ðQƵľ³¢"
+
#, c-format
msgid "W11: Warning: File \"%s\" has changed since editing started"
msgstr "W11: x: t@C \"%s\" ÍÒWJnãÉÏX³êܵ½"
+msgid "See \":help W11\" for more info."
+msgstr "Ú×Í \":help W11\" ðQƵľ³¢"
+
#, c-format
msgid "W16: Warning: Mode of file \"%s\" has changed since editing started"
msgstr "W16: x: t@C \"%s\" Ì[hªÒWJnãÉÏX³êܵ½"
+msgid "See \":help W16\" for more info."
+msgstr "Ú×Í \":help W16\" ðQƵľ³¢"
+
#, c-format
msgid "W13: Warning: File \"%s\" has been created after editing started"
msgstr "W13: x: t@C \"%s\" ÍÒWJnãÉ쬳êܵ½"
-msgid "See \":help W11\" for more info."
-msgstr "Ú×Í \":help W11\" ðQƵľ³¢"
-
msgid "Warning"
msgstr "x"
@@ -1798,7 +1743,6 @@
msgid "Executing %s"
msgstr "%s ðÀsµÄ¢Ü·"
-#. always scroll up, don't overwrite
#, c-format
msgid "autocommand %s"
msgstr "autocommand %s"
@@ -2130,6 +2074,99 @@
msgid "E256: Hangul automata ERROR"
msgstr "E256: nOI[g}gG["
+msgid "E550: Missing colon"
+msgstr "E550: Rª èܹñ"
+
+msgid "E551: Illegal component"
+msgstr "E551: s³È\\¶vfÅ·"
+
+msgid "E552: digit expected"
+msgstr "E552: lªKvÅ·"
+
+#, c-format
+msgid "Page %d"
+msgstr "%d y[W"
+
+msgid "No text to be printed"
+msgstr "óü·éeLXgª èܹñ"
+
+msgid "Printing page %d (%d%%)"
+msgstr "óü: y[W %d (%d%%)"
+
+#, c-format
+msgid " Copy %d of %d"
+msgstr " Rs[ %d (S %d )"
+
+#, c-format
+msgid "Printed: %s"
+msgstr "óüµÜµ½: %s"
+
+msgid "Printing aborted"
+msgstr "óüª~³êܵ½"
+
+msgid "E455: Error writing to PostScript output file"
+msgstr "E455: PostScriptoÍt@CÌÝG[Å·"
+
+#, c-format
+msgid "E624: Can't open file \"%s\""
+msgstr "E624: t@C \"%s\" ðJ¯Ü¹ñ"
+
+#, c-format
+msgid "E457: Can't read PostScript resource file \"%s\""
+msgstr "E457: PostScriptÌ\\[Xt@C \"%s\" ðÇßܹñ"
+
+#, c-format
+msgid "E618: file \"%s\" is not a PostScript resource file"
+msgstr "E618: t@C \"%s\" Í PostScript \\[Xt@CÅÍ èܹñ"
+
+#, c-format
+msgid "E619: file \"%s\" is not a supported PostScript resource file"
+msgstr "E619: t@C \"%s\" ÍεĢȢ PostScript \\[Xt@CÅ·"
+
+#, c-format
+msgid "E621: \"%s\" resource file has wrong version"
+msgstr "E621: \\[Xt@C \"%s\" Ío[WªÙÈèÜ·"
+
+msgid "E673: Incompatible multi-byte encoding and character set."
+msgstr "E673: Ý·«Ì³¢}`oCgGR[fBOƶZbgÅ·"
+
+msgid "E674: printmbcharset cannot be empty with multi-byte encoding."
+msgstr "E674: }`oCgGR[fBOÅÍ printmbcharset ðóÉūܹñ"
+
+msgid "E675: No default font specified for multi-byte printing."
+msgstr ""
+"E675: }`oCg¶ðóü·é½ßÌftHgtHgªwè³êĢܹñ"
+
+msgid "E324: Can't open PostScript output file"
+msgstr "E324: PostScriptoÍpÌt@CðJ¯Ü¹ñ"
+
+#, c-format
+msgid "E456: Can't open file \"%s\""
+msgstr "E456: t@C \"%s\" ðJ¯Ü¹ñ"
+
+msgid "E456: Can't find PostScript resource file \"prolog.ps\""
+msgstr "E456: PostScriptÌ\\[Xt@C \"prolog.ps\" ªÝ©èܹñ"
+
+msgid "E456: Can't find PostScript resource file \"cidfont.ps\""
+msgstr "E456: PostScriptÌ\\[Xt@C \"cidfont.ps\" ªÝ©èܹñ"
+
+#, c-format
+msgid "E456: Can't find PostScript resource file \"%s.ps\""
+msgstr "E456: PostScriptÌ\\[Xt@C \"%s.ps\" ªÝ©èܹñ"
+
+#, c-format
+msgid "E620: Unable to convert to print encoding \"%s\""
+msgstr "E620: óüGR[h \"%s\" ÖϷūܹñ"
+
+msgid "Sending to printer..."
+msgstr "v^ÉM..."
+
+msgid "E365: Failed to print PostScript file"
+msgstr "E365: PostScriptt@CÌóüɸsµÜµ½"
+
+msgid "Print job sent."
+msgstr "óüWuðMµÜµ½."
+
msgid "Add a new database"
msgstr "Vf[^x[XðÇÁ"
@@ -2326,6 +2363,9 @@
msgid "linenr out of range"
msgstr "ÍÍOÌsÔÅ·"
+msgid "not allowed in the Vim sandbox"
+msgstr "Th{bNXÅͳêܹñ"
+
#, c-format
msgid "E370: Could not load library %s"
msgstr "E370: Cu %s ð[hūܹñŵ½"
@@ -2570,6 +2610,10 @@
"E281: TCL G[: I¹R[hª®lÅÍ èܹñ!? vim-dev@vim.org "
"ÉñµÄ¾³¢"
+#, c-format
+msgid "E572: exit code %d"
+msgstr "E572: I¹R[h %d"
+
msgid "cannot get line"
msgstr "sðæ¾Å«Ü¹ñ"
@@ -2586,8 +2630,8 @@
msgid "E251: VIM instance registry property is badly formed. Deleted!"
msgstr "E251: VIM ÀÌÌo^vpeBªs³Å·. ÁµÜµ½!"
-msgid "Unknown option"
-msgstr "¢mÌIvVÅ·"
+msgid "Unknown option argument"
+msgstr "¢mÌIvVøÅ·"
msgid "Too many edit arguments"
msgstr "ÒWøª½ß¬Ü·"
@@ -2595,8 +2639,8 @@
msgid "Argument missing after"
msgstr "øª èܹñ"
-msgid "Garbage after option"
-msgstr "IvVÌãÉS~ª èÜ·"
+msgid "Garbage after option argument"
+msgstr "IvVøÌãÉS~ª èÜ·"
msgid "Too many \"+command\", \"-c command\" or \"--cmd command\" arguments"
msgstr "\"+command\", \"-c command\", \"--cmd command\" Ìøª½ß¬Ü·"
@@ -2604,6 +2648,10 @@
msgid "Invalid argument for"
msgstr "³øÈøÅ·: "
+#, c-format
+msgid "%d files to edit\n"
+msgstr "%d ÂÌt@CªÒWðT¦Ä¢Ü·\n"
+
msgid "This Vim was not compiled with the diff feature."
msgstr "±ÌVimÉÍdiff@\\ª èܹñ(RpCÝè)."
@@ -2627,10 +2675,6 @@
msgid "Vim: Warning: Input is not from a terminal\n"
msgstr "Vim: x: [©çÌüÍÅÍ èܹñ\n"
-#, c-format
-msgid "%d files to edit\n"
-msgstr "%d ÂÌt@CªÒWðT¦Ä¢Ü·\n"
-
#. just in case..
msgid "pre-vimrc command line"
msgstr "vimrcOÌR}hC"
@@ -2964,25 +3008,6 @@
msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
msgstr "--socketid <xid>\tÙÈéGTK widgetÅVimðJ"
-msgid ""
-"\n"
-"Arguments recognised by kvim (KDE version):\n"
-msgstr ""
-"\n"
-"kvimÉæÁÄðß³êéø(KDEo[W):\n"
-
-msgid "-black\t\tUse reverse video"
-msgstr "-black\t\t½]æÊðgp·é"
-
-msgid "-tip\t\t\tDisplay the tip dialog on startup"
-msgstr "-tip\t\t\tN®É`bv_CAOð\\¦·é"
-
-msgid "-notip\t\tDisable the tip dialog"
-msgstr "-notip\t\t`bv_CAOð³øÉ·é"
-
-msgid "--display <display>\tRun vim on <display>"
-msgstr "--display <display>\t<display> ÅvimðÀs·é"
-
msgid "-P <parent title>\tOpen Vim inside parent application"
msgstr "-P <eÌ^Cg>\tVimðeAvP[VÌÅN®·é"
@@ -3404,6 +3429,10 @@
msgid "E317: pointer block id wrong 2"
msgstr "E317: |C^ubNÌIDªÔáÁĢܷ 2"
+#, c-format
+msgid "E773: Symlink loop for \"%s\""
+msgstr "E773: \"%s\" ÌV{bNNª[vÉÈÁĢܷ"
+
msgid "E325: ATTENTION"
msgstr "E325: Ó"
@@ -3492,16 +3521,16 @@
"&Open Read-Only\n"
"&Edit anyway\n"
"&Recover\n"
+"&Delete it\n"
"&Quit\n"
-"&Abort\n"
-"&Delete it"
+"&Abort"
msgstr ""
"ÇêpÅJ(&O)\n"
"ÆÉ©ÒW·é(&E)\n"
"³¹é(&R)ecover\n"
+"í·é(&D)\n"
"I¹·é(&Q)\n"
-"~·é(&A)\n"
-"Á·é(&D)"
+"~·é(&A)"
msgid "E326: Too many swap files found"
msgstr "E326: Xbvt@Cª½©Â©èܵ½"
@@ -3512,8 +3541,9 @@
msgid "E328: Menu only exists in another mode"
msgstr "E328: j
[ͼÌ[hɾ¯ èÜ·"
-msgid "E329: No menu of that name"
-msgstr "E329: »Ì¼OÌj
[Í èܹñ"
+#, c-format
+msgid "E329: No menu \"%s\""
+msgstr "E329: \"%s\" Æ¢¤j
[Í èܹñ"
msgid "E330: Menu path must not lead to a sub-menu"
msgstr "E330: j
[pXÍTuj
[ð¶¶é׫ÅÍ èܹñ"
@@ -3561,9 +3591,6 @@
msgid "line %4ld:"
msgstr "s %4ld:"
-msgid "[string too long]"
-msgstr "[¶ñª·ß¬Ü·]"
-
#, c-format
msgid "E354: Invalid register name: '%s'"
msgstr "E354: ³øÈWX^¼: '%s'"
@@ -3574,20 +3601,18 @@
msgid "Interrupt: "
msgstr "Ý: "
-msgid "Hit ENTER to continue"
-msgstr "±¯éÉÍENTERðµÄ¾³¢"
-
-msgid "Hit ENTER or type command to continue"
+msgid "Press ENTER or type command to continue"
msgstr "±¯éÉÍENTERð·©R}hðü͵ľ³¢"
+#, c-format
+msgid "%s line %ld"
+msgstr "%s s %ld"
+
msgid "-- More --"
msgstr "-- p± --"
-msgid " (RET/BS: line, SPACE/b: page, d/u: half page, q: quit)"
-msgstr " (RET/BS: sè, SPACE/b: y[Wè, d/u: ¼y[Wè, q: I¹)"
-
-msgid " (RET: line, SPACE: page, d: half page, q: quit)"
-msgstr " (RET: sè, SPACE: y[Wè, d: ¼y[Wè, q: I¹)"
+msgid " SPACE/d/j: screen/page/line down, b/u/k: up, q: quit "
+msgstr " SPACE/d/j: æÊ/y[W/s º, b/uk: ã, q: I¹"
msgid "Question"
msgstr "¿â"
@@ -3625,9 +3650,21 @@
msgid "E338: Sorry, no file browser in console mode"
msgstr "E338: R\\[[hÅÍt@CuEUðg¦Ü¹ñ, ²ßñȳ¢"
+msgid "E766: Insufficient arguments for printf()"
+msgstr "E766: printf() Ìøªs\\ªÅ·"
+
+msgid "E767: Too many arguments to printf()"
+msgstr "E767: pirntf() Ìøª½ß¬Ü·"
+
msgid "W10: Warning: Changing a readonly file"
msgstr "W10: x: Çêpt@CðÏXµÜ·"
+msgid "Type number or click with mouse (<Enter> cancels): "
+msgstr "lðüÍ·é©}EXðNbNµÄ¾³¢ (<Enter> ÅLZ): "
+
+msgid "Choice number (<Enter> cancels): "
+msgstr "ÔðIðµÄ¾³¢ (<Enter> ÅLZ): "
+
msgid "1 more line"
msgstr "1 s ÇÁµÜµ½"
@@ -3737,15 +3774,6 @@
msgid "E347: No more file \"%s\" found in path"
msgstr "E347: pXÉͱêÈã \"%s\" Æ¢¤t@Cª èܹñ"
-msgid "E550: Missing colon"
-msgstr "E550: Rª èܹñ"
-
-msgid "E551: Illegal component"
-msgstr "E551: s³È\\¶vfÅ·"
-
-msgid "E552: digit expected"
-msgstr "E552: lªKvÅ·"
-
#. Get here when the server can't be found.
msgid "Cannot connect to Netbeans #2"
msgstr "Netbeans #2 Éڱūܹñ"
@@ -3768,6 +3796,12 @@
msgid "E505: "
msgstr "E505: "
+msgid "E774: 'operatorfunc' is empty"
+msgstr "E774: 'operatorfunc' IvVªóÅ·"
+
+msgid "E775: Eval feature not available"
+msgstr "E775: ®]¿@\\ª³øÉÈÁĢܷ"
+
msgid "Warning: terminal cannot highlight"
msgstr "x: gpµÄ¢é[ÍnCCgūܹñ"
@@ -3837,10 +3871,17 @@
msgid "freeing %ld lines"
msgstr "%ld sðJú"
+msgid "block of 1 line yanked"
+msgstr "1 sÌubNªN³êܵ½"
+
msgid "1 line yanked"
msgstr "1 sªN³êܵ½"
#, c-format
+msgid "block of %ld lines yanked"
+msgstr "%ld sÌubNªN³êܵ½"
+
+#, c-format
msgid "%ld lines yanked"
msgstr "%ld sªN³êܵ½"
@@ -3914,13 +3955,6 @@
msgid "E520: Not allowed in a modeline"
msgstr "E520: modeline Åͳêܹñ"
-msgid ""
-"\n"
-"\tLast set from "
-msgstr ""
-"\n"
-"\tLast set from "
-
msgid "E521: Number required after ="
msgstr "E521: = ÌãÉͪKvÅ·"
@@ -4159,14 +4193,6 @@
msgid "Opening the X display took %ld msec"
msgstr "XT[oÖÌÚ±É %ld ~b©©èܵ½"
-#. KDE sometimes produces X error that we want to ignore
-msgid ""
-"\n"
-"Vim: Got X error but we continue...\n"
-msgstr ""
-"\n"
-"Vim: X ÌG[ðoµÜµ½ª±sµÜ·...\n"
-
msgid ""
"\n"
"Vim: Got X error\n"
@@ -4336,10 +4362,6 @@
msgid "E382: Cannot write, 'buftype' option is set"
msgstr "E382: 'buftype' IvVªÝè³êÄ¢éÌÅÝܹñ"
-#
-msgid "E682: Invalid search pattern or delimiter"
-msgstr "E682: õp^[©æØèLªs³Å·"
-
msgid "E683: File name missing or invalid pattern"
msgstr "E683: t@C¼ª³¢©³øÈp^[Å·"
@@ -4350,6 +4372,9 @@
msgid "E681: Buffer is not loaded"
msgstr "E681: obt@ÍÇÝÜêܹñŵ½"
+msgid "E777: String or List expected"
+msgstr "E777: ¶ñ©XgªKvÅ·"
+
msgid "E339: Pattern too long"
msgstr "E339: p^[ª·ß¬Ü·"
@@ -4429,6 +4454,11 @@
msgid "E71: Invalid character after %s%%"
msgstr "E71: %s%% ÌãÉs³È¶ª èܵ½"
+#
+#, c-format
+msgid "E769: Missing ] after %s["
+msgstr "E769: %s[ ÌãÉ ] ª èܹñ"
+
#, c-format
msgid "E554: Syntax error in %s{...}"
msgstr "E554: %s{...} àɶ@G[ª èÜ·"
@@ -4494,12 +4524,6 @@
msgid "recording"
msgstr "L^"
-msgid "search hit TOP, continuing at BOTTOM"
-msgstr "ãÜÅõµ½ÌźÉßèÜ·"
-
-msgid "search hit BOTTOM, continuing at TOP"
-msgstr "ºÜÅõµ½ÌÅãÉßèÜ·"
-
#, c-format
msgid "E383: Invalid search string: %s"
msgstr "E383: ³øÈõ¶ñÅ·: %s"
@@ -4553,6 +4577,339 @@
msgid "E389: Couldn't find pattern"
msgstr "E389: p^[ðݯçêܹñ"
+msgid "E759: Format error in spell file"
+msgstr "E759: Xyt@C̮G[ŷ"
+
+msgid "E758: Truncated spell file"
+msgstr "E758: Xyt@CªØæçêÄ¢éæ¤Å·"
+
+#, c-format
+msgid "Trailing text in %s line %d: %s"
+msgstr "%s (%d sÚ) ɱeLXg: %s"
+
+#, c-format
+msgid "Affix name too long in %s line %d: %s"
+msgstr "%s (%d sÚ) Ì affix ¼ª·ß¬Ü·: %s"
+
+msgid "E761: Format error in affix file FOL, LOW or UPP"
+msgstr ""
+"E761: affixt@CÌ FOL, LOW àµÍ UPP ÌtH[}bgÉG[ª èÜ·"
+
+msgid "E762: Character in FOL, LOW or UPP is out of range"
+msgstr "E762: FOL, LOW àµÍ UPP ̶ªÍÍOÅ·"
+
+msgid "Compressing word tree..."
+msgstr "Pêc[ð³kµÄ¢Ü·..."
+
+msgid "E756: Spell checking is not enabled"
+msgstr "E756: ·Ø`FbNͳø»³êĢܷ"
+
+#, c-format
+msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
+msgstr ""
+"x: PêXg \"%s.%s.spl\" ¨æÑ \"%s.ascii.spl\" ͩ©èܹñ"
+
+#, c-format
+msgid "Reading spell file \"%s\""
+msgstr "Xyt@C \"%s\" ðÇ"
+
+msgid "E757: This does not look like a spell file"
+msgstr "E757: Xyt@CÅÍÈ¢æ¤Å·"
+
+msgid "E771: Old spell file, needs to be updated"
+msgstr "E771: âXyt@CÈÌÅ, Abvf[gµÄ¾³¢"
+
+msgid "E772: Spell file is for newer version of Vim"
+msgstr "E772: æèVµ¢o[WÌ Vim pÌXyt@CÅ·"
+
+msgid "E770: Unsupported section in spell file"
+msgstr "E770: Xyt@CÉT|[gµÄ¢È¢ZNVª èÜ·"
+
+#, c-format
+msgid "Warning: region %s not supported"
+msgstr "x9: %s Æ¢¤ÍÍÍT|[g³êĢܹñ"
+
+#, c-format
+msgid "Reading affix file %s ..."
+msgstr "affix t@C %s ðÇ..."
+
+#, c-format
+msgid "Conversion failure for word in %s line %d: %s"
+msgstr "%s (%d sÚ) ÌPêðϷūܹñŵ½: %s"
+
+#, c-format
+msgid "Conversion in %s not supported: from %s to %s"
+msgstr "%s àÌÌÏ·ÍT|[g³êĢܹñ: %s ©ç %s Ö"
+
+#, c-format
+msgid "Conversion in %s not supported"
+msgstr "%s àÌÏ·ÍT|[g³êĢܹñ"
+
+#, c-format
+msgid "Invalid value for FLAG in %s line %d: %s"
+msgstr "%s àÌ %d sÚÌ FLAG ɳøÈlª èÜ·: %s"
+
+#, c-format
+msgid "FLAG after using flags in %s line %d: %s"
+msgstr "%s àÌ %d sÚÉtOÌñdgpª èÜ·: %s"
+
+#, c-format
+msgid "Wrong COMPOUNDMAX value in %s line %d: %s"
+msgstr "%s Ì %d sÚÌ COMPOUNDMAX ÌlÉëèª èÜ·: %s"
+
+#, c-format
+msgid "Wrong COMPOUNDMIN value in %s line %d: %s"
+msgstr "%s Ì %d sÚÌ COMPOUNDMIN ÌlÉëèª èÜ·: %s"
+
+#, c-format
+msgid "Wrong COMPOUNDSYLMAX value in %s line %d: %s"
+msgstr "%s Ì %d sÚÌ COMPOUNDSYLMAX ÌlÉëèª èÜ·: %s"
+
+#, c-format
+msgid "Different combining flag in continued affix block in %s line %d: %s"
+msgstr ""
+"%s Ì %d sÚÌ A± affix ubNÌtOÌg¹Éᢪ èÜ·: %s"
+
+#, c-format
+msgid "Duplicate affix in %s line %d: %s"
+msgstr "%s Ì %d sÚÉ d¡µ½ affix ðoµÜµ½: %s"
+
+#, c-format
+msgid ""
+"Affix also used for BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND in %s line %d: "
+"%s"
+msgstr ""
+"%s Ì %d sÚÌ affix Í BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND "
+"ÉgpµÄ¾³¢: %s"
+
+#, c-format
+msgid "Expected Y or N in %s line %d: %s"
+msgstr "%s Ì %d sÚÅÍ Y © N ªKvÅ·: %s"
+
+#, c-format
+msgid "Broken condition in %s line %d: %s"
+msgstr "%s Ì %d sÚÌ ðÍóêĢܷ: %s"
+
+#, c-format
+msgid "Expected REP(SAL) count in %s line %d"
+msgstr "%s Ì %d sÚÉÍ REP(SAL) ÌñªKvÅ·"
+
+#, c-format
+msgid "Expected MAP count in %s line %d"
+msgstr "%s Ì %d sÚÉÍ MAP ÌñªKvÅ·"
+
+#, c-format
+msgid "Duplicate character in MAP in %s line %d"
+msgstr "%s Ì %d sÚÌ MAP Éd¡µ½¶ª èÜ·"
+
+#, c-format
+msgid "Unrecognized or duplicate item in %s line %d: %s"
+msgstr "%s Ì %d sÚÉ F¯Å«È¢©d¡µ½Úª èÜ·: %s"
+
+#, c-format
+msgid "Missing FOL/LOW/UPP line in %s"
+msgstr "%d sÚÉ FOL/LOW/UPP ª èܹñ"
+
+msgid "COMPOUNDSYLMAX used without SYLLABLE"
+msgstr "SYLLABLE ªwè³êÈ¢ COMPOUNDSYLMAX"
+
+msgid "Too many postponed prefixes"
+msgstr "xãuqª½·¬Ü·"
+
+msgid "Too many compound flags"
+msgstr "¡tOª½ß¬Ü·"
+
+msgid "Too many posponed prefixes and/or compound flags"
+msgstr "xãuq Æ/àµÍ ¡tOª½·¬Ü·"
+
+#, c-format
+msgid "Missing SOFO%s line in %s"
+msgstr "SOFO%s sª %s É èܹñ"
+
+#, c-format
+msgid "Both SAL and SOFO lines in %s"
+msgstr "SALs Æ SOFOs ª %s żûwè³êĢܷ"
+
+#, c-format
+msgid "Flag is not a number in %s line %d: %s"
+msgstr "%s Ì %d sÌ tOªlÅÍ èܹñ: %s"
+
+#, c-format
+msgid "Illegal flag in %s line %d: %s"
+msgstr "%s Ì %d sÚÌ tOªs³Å·: %s"
+
+#, c-format
+msgid "%s value differs from what is used in another .aff file"
+msgstr "l %s Í¼Ì .aff t@CÅgp³ê½ÌÆÙÈèÜ·"
+
+#, c-format
+msgid "Reading dictionary file %s ..."
+msgstr "«t@C %s ðXL..."
+
+#, c-format
+msgid "E760: No word count in %s"
+msgstr "E760: %s ÉÍPêª èܹñ"
+
+#, c-format
+msgid "line %6d, word %6d - %s"
+msgstr "s %6d, Pê %6d - %s"
+
+#, c-format
+msgid "Duplicate word in %s line %d: %s"
+msgstr "%s Ì %d sÚÅ d¡PêªÝ©èܵ½: %s"
+
+#, c-format
+msgid "First duplicate word in %s line %d: %s"
+msgstr "d¡Ì¤¿ÅÌPêÍ %s Ì %d sÚÅ·: %s"
+
+#, c-format
+msgid "%d duplicate word(s) in %s"
+msgstr "%d ÂÌPꪩ©èܵ½ (%s à)"
+
+#, c-format
+msgid "Ignored %d word(s) with non-ASCII characters in %s"
+msgstr "ñASCII¶ðÜÞ %d ÂÌPêð³µÜµ½ (%s à)"
+
+#, c-format
+msgid "Reading word file %s ..."
+msgstr "WüÍ©çÇÝ..."
+
+#, c-format
+msgid "Duplicate /encoding= line ignored in %s line %d: %s"
+msgstr "%s Ì %d sÚÌ d¡µ½ /encoding= sð³µÜµ½: %s"
+
+#, c-format
+msgid "/encoding= line after word ignored in %s line %d: %s"
+msgstr "s Ì %d sÚÌ PêÌãÌ /encoding= sð³µÜµ½: %s"
+
+#, c-format
+msgid "Duplicate /regions= line ignored in %s line %d: %s"
+msgstr "%s Ì %d sÚÌ d¡µ½ /regions= sð³µÜµ½: %s"
+
+#, c-format
+msgid "Too many regions in %s line %d: %s"
+msgstr "%s Ì %d sÚ, ÍÍw誽·¬Ü·: %s"
+
+#, c-format
+msgid "/ line ignored in %s line %d: %s"
+msgstr "%s Ì %d sÚÌ d¡µ½ / sð³µÜµ½: %s"
+
+#, c-format
+msgid "Invalid region nr in %s line %d: %s"
+msgstr "%s Ì %d sÚ ³øÈ nr ÌæÅ·: %s"
+
+#, c-format
+msgid "Unrecognized flags in %s line %d: %s"
+msgstr "%s Ì %d sÚ F¯s\\ÈtOÅ·: %s"
+
+#, c-format
+msgid "Ignored %d words with non-ASCII characters"
+msgstr "ñASCII¶ðÜÞ %d ÂÌPêð³µÜµ½"
+
+msgid "Compressed %d of %d nodes; %d (%d%%) remaining"
+msgstr "m[h %d Â(S %d Â) ð³kµÜµ½; cè %d (%d%%)"
+
+msgid "Reading back spell file..."
+msgstr "Xyt@CðtÇ"
+
+#.
+#. * Go through the trie of good words, soundfold each word and add it to
+#. * the soundfold trie.
+#.
+msgid "Performing soundfolding..."
+msgstr "¹ºôÝðÀs..."
+
+#, c-format
+msgid "Number of words after soundfolding: %ld"
+msgstr "¹ºôÝãÌPê: %ld"
+
+#, c-format
+msgid "Total number of words: %d"
+msgstr "Pê: %d"
+
+#, c-format
+msgid "Writing suggestion file %s ..."
+msgstr "C³óât@C \"%s\" ðÝ..."
+
+#, c-format
+msgid "Estimated runtime memory use: %d bytes"
+msgstr "ègpÊ: %d oCg"
+
+msgid "E751: Output file name must not have region name"
+msgstr "E751: oÍt@C¼ÉÍÍͼðÜßçêܹñ"
+
+msgid "E754: Only up to 8 regions supported"
+msgstr "E754: ÍÍÍ 8 ÂÜŵ©T|[g³êĢܹñ"
+
+#, c-format
+msgid "E755: Invalid region in %s"
+msgstr "E755: ³øÈÍÍÅ·: %s"
+
+msgid "Warning: both compounding and NOBREAK specified"
+msgstr "x: ¡tOÆ NOBREAK ª¼ûÆàwè³êܵ½"
+
+#, c-format
+msgid "Writing spell file %s ..."
+msgstr "Xyt@C %s ðÝ..."
+
+msgid "Done!"
+msgstr "ÀsµÜµ½!"
+
+#, c-format
+msgid "E765: 'spellfile' does not have %ld entries"
+msgstr "E765: 'spellfile' ÉÍ %ld ÂÌGgÍ èܹñ"
+
+msgid "E763: Word characters differ between spell files"
+msgstr "E763: Pê̶ªXyt@CÆÙÈèÜ·"
+
+msgid "Sorry, no suggestions"
+msgstr "cOÅ·ª, C³óâÍ èܹñ"
+
+#, c-format
+msgid "Sorry, only %ld suggestions"
+msgstr "cOÅ·ª, C³óâÍ %ld µ© èܹñ"
+
+#. avoid more prompt
+#, c-format
+msgid "Change \"%.*s\" to:"
+msgstr "\"%.*s\" ðÖÏ·:"
+
+#, c-format
+msgid " < \"%.*s\""
+msgstr " < \"%.*s\""
+
+msgid "E752: No previous spell replacement"
+msgstr "E752: Xyu·ªÜ¾Às³êĢܹñ"
+
+#, c-format
+msgid "E753: Not found: %s"
+msgstr "E753: Ý©èܹñ: %s"
+
+#, c-format
+msgid "E778: This does not look like a .sug file: %s"
+msgstr "E778: .sug t@CÅÍÈ¢æ¤Å·: %s"
+
+#, c-format
+msgid "E779: Old .sug file, needs to be updated: %s"
+msgstr "E779: â .sug t@CÈÌÅ, Abvf[gµÄ¾³¢"
+
+#, c-format
+msgid "E780: .sug file is for newer version of Vim: %s"
+msgstr "E780: æèVµ¢o[WÌ Vim pÌ .sug t@CÅ·: %s"
+
+#, c-format
+msgid "E781: .sug file doesn't match .spl file: %s"
+msgstr "E781: .sug t@Cª .spl t@CÆêvµÜ¹ñ: %s"
+
+#, c-format
+msgid "E782: error while reading .sug file: %s"
+msgstr "E782: .sug t@CÌÇÉG[ª¶µÜµ½: %s"
+
+#. This should have been checked when generating the .spl
+#. * file.
+msgid "E783: duplicate char in MAP entry"
+msgstr "E783: MAP GgÉd¡¶ª¶ÝµÜ·"
+
#, c-format
msgid "E390: Illegal argument: %s"
msgstr "E390: s³ÈøÅ·: %s"
@@ -4763,13 +5120,6 @@
msgid "file\n"
msgstr "t@C\n"
-#.
-#. * Ask to select a tag from the list.
-#. * When using ":silent" assume that <CR> was entered.
-#.
-msgid "Enter nr of choice (<CR> to abort): "
-msgstr "Ið·éÔðü͵ľ³¢ (<CR>Å~): "
-
msgid "E427: There is only one matching tag"
msgstr "E427: Y^Oª1¾¯µ© èܹñ"
@@ -5060,9 +5410,6 @@
msgid "with (classic) GUI."
msgstr "with (NVbN) GUI."
-msgid "with KDE GUI."
-msgstr "with KDE GUI."
-
msgid " Features included (+) or not (-):\n"
msgstr " @\\Ìê Lø(+)/³ø(-)\n"
@@ -5439,6 +5786,9 @@
msgid "E42: No Errors"
msgstr "E42: G[Í èܹñ"
+msgid "E776: No location list"
+msgstr "E776: êXgÍ èܹñ"
+
msgid "E43: Damaged match string"
msgstr "E43: Y¶ñªj¹µÄ¢Ü·"
@@ -5532,11 +5882,25 @@
msgid "E685: Internal error: %s"
msgstr "E685: àG[Å·: %s"
-msgid "E361: Crash intercepted; regexp too complex?"
-msgstr "E361: NbV
Éæèf; ³K\\»ª¡G߬é©à?"
-
-msgid "E363: pattern caused out-of-stack error"
-msgstr "E363: p^[ÉæéX^bNs«G[Å·"
+msgid "E363: pattern uses more memory than 'maxmempattern'"
+msgstr "E363: p^[ª 'maxmempattern' ÈãÌðgpµÜ·"
msgid "E749: empty buffer"
msgstr "E749: obt@ªóÅ·"
+
+#
+msgid "E682: Invalid search pattern or delimiter"
+msgstr "E682: õp^[©æØèLªs³Å·"
+
+msgid "E139: File is loaded in another buffer"
+msgstr "E139: ¯¶¼OÌt@Cª¼Ìobt@ÅÇÜêĢܷ"
+
+#, c-format
+msgid "E764: Option '%s' is not set"
+msgstr "E764: IvV '%s' ÍÝè³êĢܹñ"
+
+msgid "search hit TOP, continuing at BOTTOM"
+msgstr "ãÜÅõµ½ÌźÉßèÜ·"
+
+msgid "search hit BOTTOM, continuing at TOP"
+msgstr "ºÜÅõµ½ÌÅãÉßèÜ·"
diff --git a/src/popupmenu.c b/src/popupmenu.c
index a129d14..7024e55 100644
--- a/src/popupmenu.c
+++ b/src/popupmenu.c
@@ -84,7 +84,7 @@
}
/* don't display when we only have room for one line */
- if (pum_height <= 1)
+ if (pum_height < 1 || (pum_height == 1 && size > 1))
return;
/* Compute the width of the widest match. */
diff --git a/src/quickfix.c b/src/quickfix.c
index ca6cc40..7136b7e 100644
--- a/src/quickfix.c
+++ b/src/quickfix.c
@@ -2566,13 +2566,14 @@
grep_internal(cmdidx)
cmdidx_T cmdidx;
{
- return ((cmdidx == CMD_grep || cmdidx == CMD_grepadd)
+ return ((cmdidx == CMD_grep || cmdidx == CMD_lgrep
+ || cmdidx == CMD_grepadd || cmdidx == CMD_lgrepadd)
&& STRCMP("internal",
*curbuf->b_p_gp == NUL ? p_gp : curbuf->b_p_gp) == 0);
}
/*
- * Used for ":make", ":grep" and ":grepadd".
+ * Used for ":make", ":lmake", ":grep", ":lgrep", ":grepadd", and ":lgrepadd"
*/
void
ex_make(eap)
@@ -2581,14 +2582,19 @@
char_u *fname;
char_u *cmd;
unsigned len;
+ win_T *wp = NULL;
+ qf_info_T *qi;
#ifdef FEAT_AUTOCMD
char_u *au_name = NULL;
switch (eap->cmdidx)
{
case CMD_make: au_name = (char_u *)"make"; break;
+ case CMD_lmake: au_name = (char_u *)"lmake"; break;
case CMD_grep: au_name = (char_u *)"grep"; break;
+ case CMD_lgrep: au_name = (char_u *)"lgrep"; break;
case CMD_grepadd: au_name = (char_u *)"grepadd"; break;
+ case CMD_lgrepadd: au_name = (char_u *)"lgrepadd"; break;
default: break;
}
if (au_name != NULL)
@@ -2609,6 +2615,15 @@
return;
}
+ if (eap->cmdidx == CMD_lmake || eap->cmdidx == CMD_lgrep
+ || eap->cmdidx == CMD_lgrepadd)
+ {
+ qi = ll_get_or_alloc_list(curwin);
+ if (qi == NULL)
+ return;
+ wp = curwin;
+ }
+
autowrite_all();
fname = get_mef_name();
if (fname == NULL)
@@ -2647,10 +2662,12 @@
(void)char_avail();
#endif
- if (qf_init(NULL, fname, eap->cmdidx != CMD_make ? p_gefm : p_efm,
- eap->cmdidx != CMD_grepadd) > 0
+ if (qf_init(wp, fname, (eap->cmdidx != CMD_make
+ && eap->cmdidx != CMD_lmake) ? p_gefm : p_efm,
+ (eap->cmdidx != CMD_grepadd
+ && eap->cmdidx != CMD_lgrepadd)) > 0
&& !eap->forceit)
- qf_jump(NULL, 0, 0, FALSE); /* display first error */
+ qf_jump(wp, 0, 0, FALSE); /* display first error */
mch_remove(fname);
vim_free(fname);
@@ -2832,6 +2849,9 @@
/*
* ":vimgrep {pattern} file(s)"
+ * ":vimgrepadd {pattern} file(s)"
+ * ":lvimgrep {pattern} file(s)"
+ * ":lvimgrepadd {pattern} file(s)"
*/
void
ex_vimgrep(eap)
@@ -2843,7 +2863,9 @@
char_u *s;
char_u *p;
int fi;
+ qf_info_T *qi = &ql_info;
qfline_T *prevp = NULL;
+ win_T *wp = NULL;
long lnum;
buf_T *buf;
int duplicate_name = FALSE;
@@ -2859,12 +2881,13 @@
char_u *au_name = NULL;
int flags = 0;
colnr_T col;
- qf_info_T *qi = &ql_info;
switch (eap->cmdidx)
{
case CMD_vimgrep: au_name = (char_u *)"vimgrep"; break;
+ case CMD_lvimgrep: au_name = (char_u *)"lvimgrep"; break;
case CMD_vimgrepadd: au_name = (char_u *)"vimgrepadd"; break;
+ case CMD_lvimgrepadd: au_name = (char_u *)"lvimgrepadd"; break;
default: break;
}
if (au_name != NULL)
@@ -2876,6 +2899,15 @@
}
#endif
+ if (eap->cmdidx == CMD_grep || eap->cmdidx == CMD_lvimgrep
+ || eap->cmdidx == CMD_lgrepadd || eap->cmdidx == CMD_lvimgrepadd)
+ {
+ qi = ll_get_or_alloc_list(curwin);
+ if (qi == NULL)
+ return;
+ wp = curwin;
+ }
+
/* Get the search pattern: either white-separated or enclosed in // */
regmatch.regprog = NULL;
p = skip_vimgrep_pat(eap->arg, &s, &flags);
@@ -2897,7 +2929,8 @@
goto theend;
}
- if ((eap->cmdidx != CMD_grepadd && eap->cmdidx != CMD_vimgrepadd)
+ if ((eap->cmdidx != CMD_grepadd && eap->cmdidx != CMD_lgrepadd &&
+ eap->cmdidx != CMD_vimgrepadd && eap->cmdidx != CMD_lvimgrepadd)
|| qi->qf_curlist == qi->qf_listcount)
/* make place for a new list */
qf_new_list(qi);
@@ -3072,7 +3105,7 @@
if (qi->qf_lists[qi->qf_curlist].qf_count > 0)
{
if ((flags & VGR_NOJUMP) == 0)
- qf_jump(NULL, 0, 0, eap->forceit);
+ qf_jump(wp, 0, 0, eap->forceit);
}
else
EMSG2(_(e_nomatch2), s);
@@ -3396,7 +3429,9 @@
/*
* ":[range]cbuffer [bufnr]" command.
+ * ":[range]caddbuffer [bufnr]" command.
* ":[range]lbuffer [bufnr]" command.
+ * ":[range]laddbuffer [bufnr]" command.
*/
void
ex_cbuffer(eap)
@@ -3405,7 +3440,7 @@
buf_T *buf = NULL;
qf_info_T *qi = &ql_info;
- if (eap->cmdidx == CMD_lbuffer)
+ if (eap->cmdidx == CMD_lbuffer || eap->cmdidx == CMD_laddbuffer)
{
qi = ll_get_or_alloc_list(curwin);
if (qi == NULL)
@@ -3431,7 +3466,10 @@
|| eap->line2 < 1 || eap->line2 > buf->b_ml.ml_line_count)
EMSG(_(e_invrange));
else
- qf_init_ext(qi, NULL, buf, NULL, p_efm, TRUE, eap->line1, eap->line2);
+ qf_init_ext(qi, NULL, buf, NULL, p_efm,
+ (eap->cmdidx == CMD_cbuffer
+ || eap->cmdidx == CMD_lbuffer),
+ eap->line1, eap->line2);
}
}
diff --git a/src/version.h b/src/version.h
index 48ae412..5d6c7f9 100644
--- a/src/version.h
+++ b/src/version.h
@@ -36,5 +36,5 @@
#define VIM_VERSION_NODOT "vim70aa"
#define VIM_VERSION_SHORT "7.0aa"
#define VIM_VERSION_MEDIUM "7.0aa ALPHA"
-#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2006 Feb 3)"
-#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2006 Feb 3, compiled "
+#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2006 Feb 4)"
+#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2006 Feb 4, compiled "