mirror of
https://github.com/macvim-dev/macvim.git
synced 2026-06-07 15:37:14 +02:00
Merge remote-tracking branch 'vim/master'
This commit is contained in:
Yee Cheng Chin
@@ -14,7 +14,6 @@ SRC_ALL = \
|
||||
ci/if_ver*.vim \
|
||||
src/Make_all.mak \
|
||||
src/README.md \
|
||||
src/README_VIM9.md \
|
||||
src/alloc.h \
|
||||
src/arabic.c \
|
||||
src/arglist.c \
|
||||
@@ -661,6 +660,7 @@ SRC_EXTRA = \
|
||||
RT_ALL = \
|
||||
README.txt \
|
||||
README.md \
|
||||
README_VIM9.md \
|
||||
LICENSE \
|
||||
CONTRIBUTING.md \
|
||||
runtime/bugreport.vim \
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
*cmdline.txt* For Vim version 8.2. Last change: 2019 Dec 17
|
||||
*cmdline.txt* For Vim version 8.2. Last change: 2020 Feb 15
|
||||
|
||||
|
||||
VIM REFERENCE MANUAL by Bram Moolenaar
|
||||
@@ -586,6 +586,7 @@ followed by another Vim command:
|
||||
:command
|
||||
:cscope
|
||||
:debug
|
||||
:eval
|
||||
:folddoopen
|
||||
:folddoclosed
|
||||
:function
|
||||
|
||||
+17
-9
@@ -1,4 +1,4 @@
|
||||
*eval.txt* For Vim version 8.2. Last change: 2020 Feb 14
|
||||
*eval.txt* For Vim version 8.2. Last change: 2020 Feb 22
|
||||
|
||||
|
||||
VIM REFERENCE MANUAL by Bram Moolenaar
|
||||
@@ -1992,7 +1992,7 @@ v:null An empty String. Used to put "null" in JSON. See
|
||||
|
||||
*v:numbersize* *numbersize-variable*
|
||||
v:numbersize Number of bits in a Number. This is normally 64, but on some
|
||||
systems it my be 32.
|
||||
systems it may be 32.
|
||||
|
||||
*v:oldfiles* *oldfiles-variable*
|
||||
v:oldfiles List of file names that is loaded from the |viminfo| file on
|
||||
@@ -6924,6 +6924,10 @@ match({expr}, {pat} [, {start} [, {count}]]) *match()*
|
||||
The 'ignorecase' option is used to set the ignore-caseness of
|
||||
the pattern. 'smartcase' is NOT used. The matching is always
|
||||
done like 'magic' is set and 'cpoptions' is empty.
|
||||
Note that a match at the start is preferred, thus when the
|
||||
pattern is using "*" (any number of matches) it tends to find
|
||||
zero matches at the start instead of a number of matches
|
||||
further down in the text.
|
||||
|
||||
Can also be used as a |method|: >
|
||||
GetList()->match('word')
|
||||
@@ -10727,6 +10731,7 @@ browsefilter Compiled with support for |browsefilter|.
|
||||
bsd Compiled on an OS in the BSD family (excluding macOS).
|
||||
builtin_terms Compiled with some builtin terminals.
|
||||
byte_offset Compiled with support for 'o' in 'statusline'
|
||||
channel Compiled with support for |channel| and |job|
|
||||
cindent Compiled with 'cindent' support.
|
||||
clientserver Compiled with remote invocation support |clientserver|.
|
||||
clipboard Compiled with 'clipboard' support.
|
||||
@@ -10841,7 +10846,7 @@ python_dynamic Python 2.x interface is dynamically loaded. |has-python|
|
||||
python3 Python 3.x interface available. |has-python|
|
||||
python3_compiled Compiled with Python 3.x interface. |has-python|
|
||||
python3_dynamic Python 3.x interface is dynamically loaded. |has-python|
|
||||
pythonx Compiled with |python_x| interface. |has-pythonx|
|
||||
pythonx Python 2.x and/or 3.x interface available. |python_x|
|
||||
qnx QNX version of Vim.
|
||||
quickfix Compiled with |quickfix| support.
|
||||
reltime Compiled with |reltime()| support.
|
||||
@@ -11871,11 +11876,11 @@ text...
|
||||
":endtry" is reached thereafter, the next
|
||||
(dynamically) surrounding ":try" is checked for
|
||||
a corresponding ":finally" etc. Then the script
|
||||
processing is terminated. (Whether a function
|
||||
definition has an "abort" argument does not matter.)
|
||||
processing is terminated. Whether a function
|
||||
definition has an "abort" argument does not matter.
|
||||
Example: >
|
||||
:try | edit too much | finally | echo "cleanup" | endtry
|
||||
:echo "impossible" " not reached, script terminated above
|
||||
try | call Unknown() | finally | echomsg "cleanup" | endtry
|
||||
echomsg "not reached"
|
||||
<
|
||||
Moreover, an error or interrupt (dynamically) inside
|
||||
":try" and ":endtry" is converted to an exception. It
|
||||
@@ -11892,8 +11897,8 @@ text...
|
||||
error exception is not caught, always beginning with
|
||||
the error number.
|
||||
Examples: >
|
||||
:try | sleep 100 | catch /^Vim:Interrupt$/ | endtry
|
||||
:try | edit | catch /^Vim(edit):E\d\+/ | echo "error" | endtry
|
||||
try | sleep 100 | catch /^Vim:Interrupt$/ | endtry
|
||||
try | edit | catch /^Vim(edit):E\d\+/ | echo "error" | endtry
|
||||
<
|
||||
*:cat* *:catch* *E603* *E604* *E605*
|
||||
:cat[ch] /{pattern}/ The following commands until the next |:catch|,
|
||||
@@ -12048,6 +12053,9 @@ text...
|
||||
these are hard to recognize and therefore not to be
|
||||
used.
|
||||
|
||||
The command cannot be followed by "|" and another
|
||||
command, since "|" is seen as part of the expression.
|
||||
|
||||
|
||||
*:exe* *:execute*
|
||||
:exe[cute] {expr1} .. Executes the string that results from the evaluation
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
*testing.txt* For Vim version 8.2. Last change: 2020 Feb 08
|
||||
*testing.txt* For Vim version 8.2. Last change: 2020 Feb 22
|
||||
|
||||
|
||||
VIM REFERENCE MANUAL by Bram Moolenaar
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
*textprop.txt* For Vim version 8.2. Last change: 2020 Jan 10
|
||||
*textprop.txt* For Vim version 8.2. Last change: 2020 Feb 22
|
||||
|
||||
|
||||
VIM REFERENCE MANUAL by Bram Moolenaar
|
||||
@@ -143,8 +143,9 @@ prop_add({lnum}, {col}, {props})
|
||||
within one line, or use "end_lnum" and "end_col" for a
|
||||
property that spans more than one line.
|
||||
When neither "length" nor "end_col" are given the property
|
||||
will be zero-width. That means it will not be highlighted but
|
||||
will move with the text, as a kind of mark.
|
||||
will be zero-width. That means it will move with the text, as
|
||||
a kind of mark. One character will be highlighted, if the
|
||||
type specifies highlighting.
|
||||
The property can end exactly at the last character of the
|
||||
text, or just after it. In the last case, if text is appended
|
||||
to the line, the text property size will increase, also when
|
||||
@@ -335,10 +336,11 @@ properties below the changed text, so that they still highlight the same text,
|
||||
thus you don't need to update these.
|
||||
|
||||
|
||||
Text property columns are not updated: ~
|
||||
Text property columns are not updated or copied: ~
|
||||
|
||||
- When setting the line with |setline()| or through an interface, such as Lua,
|
||||
Tcl or Python. Vim does not know what text got inserted or deleted.
|
||||
- With a command like `:move`, which takes a line of text out of context.
|
||||
|
||||
|
||||
vim:tw=78:ts=8:noet:ft=help:norl:
|
||||
|
||||
+31
-17
@@ -1,4 +1,4 @@
|
||||
*todo.txt* For Vim version 8.2. Last change: 2020 Feb 15
|
||||
*todo.txt* For Vim version 8.2. Last change: 2020 Feb 25
|
||||
|
||||
|
||||
VIM REFERENCE MANUAL by Bram Moolenaar
|
||||
@@ -38,15 +38,20 @@ browser use: https://github.com/vim/vim/issues/1234
|
||||
*known-bugs*
|
||||
-------------------- Known bugs and current work -----------------------
|
||||
|
||||
Include ipv6 syntax changes? (DJ Lucas, #5360)
|
||||
|
||||
Avoid modifyOtherKeys temporarily:
|
||||
call modify_other_keys(v:false) " disable modifyOtherKeys
|
||||
Should fix #5617.
|
||||
Patch for this (#5696):
|
||||
- Empty text prop which includes start/end does not grow when inserting text.
|
||||
(Axel Forsman, #5679)
|
||||
|
||||
Vim9 script:
|
||||
- "func" inside "vim9script" doesn't work? (Ben Jackson, #5670)
|
||||
- Completion for :disassemble
|
||||
- "echo Func()" is an error if Func() does not return anything.
|
||||
- Make "g:imported = Export.exported" work in Vim9 script.
|
||||
- Make Foo.Bar() work to call the dict function. (#5676)
|
||||
- make "let var: string" work in a vim9script.
|
||||
- Disallow unlet for local/script/imported vars
|
||||
- Support type for ":let"/":const" at script level for Vim9 script.
|
||||
(Ben Jackson, #5671)
|
||||
- :func inside vim9script must still use a:arg
|
||||
- Make "++nr" work.
|
||||
- Check that import in legacy script works and puts item in s:
|
||||
@@ -79,20 +84,25 @@ Vim9 script:
|
||||
LOADVARARG (varags idx)
|
||||
|
||||
Popup windows:
|
||||
- With terminal in popup, allow for popup_hide() to temporarily hide it.?
|
||||
- Use popup (or popup menu) for command line completion
|
||||
- When using a popup for the info of a completion menu, and there is not
|
||||
enough space, let the popup overlap with the menu. (#4544)
|
||||
- Implement flip option.
|
||||
- Make redrawing more efficient and avoid flicker:
|
||||
- put popup menu also in popup_mask?
|
||||
- Match does not have right BG color if line length equals popup width.
|
||||
(#5658)
|
||||
- Any other commands to disable in a popup window?
|
||||
Use ERROR_IF_POPUP_WINDOW for these.
|
||||
- Figure out the size and position better if wrapping inserts indent
|
||||
|
||||
Text properties:
|
||||
- prop_find() may not find text property at start of the line. (#5663)
|
||||
- Get E685 with a sequence of commands. (#5674)
|
||||
- Combining text property with 'cursorline' does not always work (Billie
|
||||
Cleek, #5533)
|
||||
- Text properties spanning more than one line
|
||||
- Text properties spanning more than one line. #5683
|
||||
- See remarks at top of src/textprop.c
|
||||
|
||||
'incsearch' with :s:
|
||||
@@ -161,14 +171,17 @@ Error numbers available:
|
||||
E451, E452, E453, E454, E460, E489, E491, E565, E578, E610, E611, E653,
|
||||
E654, E856, E857, E860, E861, E900
|
||||
|
||||
Patch to move duplicated code to a function. (Yegappan Lakshmanan, #5330)
|
||||
Patch to fix drawing error with DirectX. (James Grant, #5688)
|
||||
Causes flicker on resizing.
|
||||
|
||||
Patch to use more FOR_ALL_ macros and use them. (Yegappan Lakshmanan, #5339)
|
||||
|
||||
Patch to explain use of "%" in :!. (#5591)
|
||||
Patch to explain use of "%" in :!. (David Briscoe, #5591)
|
||||
|
||||
Patch to add "-d" to xxd. (#5616)
|
||||
|
||||
Patch to add Turkish manual. (Emir Sarı, #5641)
|
||||
|
||||
Running test_gui and test_gui_init with Motif sometimes kills the window
|
||||
manager. Problem with Motif? Now test_gui crashes in submenu_change().
|
||||
Athena is OK.
|
||||
@@ -187,6 +200,11 @@ undo result wrong: Masato Nishihata, #4798
|
||||
When 'lazyredraw' is set sometimes the title is not updated.
|
||||
(Jason Franklin, 2020 Feb 3) Looks like a race condition.
|
||||
|
||||
Strange sequence of BufWipeout and BufNew events while doing omni-complete.
|
||||
(Paul Jolly, #5656)
|
||||
Get BufDelete without preceding BufNew. (Paul Jolly, #5694)
|
||||
BufWinenter event not fired when saving unnamed buffer. (Paul Jolly, #5655)
|
||||
|
||||
Patch to add function to return the text used in the quickfix window.
|
||||
(Yegappan, #5465)
|
||||
|
||||
@@ -203,11 +221,6 @@ Undo puts cursor in wrong line after "cG<Esc>" undo.
|
||||
:unmap <c-n> gives error but does remove the mapping. (Antony Scriven, 2019
|
||||
Dec 19)
|
||||
|
||||
Dos uninstal may delete vim.bat from the wrong directory (e.g., when someone
|
||||
makes his own wrapper). Add a magic string with the version number to the
|
||||
.bat file and check for it in the uninstaller. E.g.
|
||||
# uninstall key: vim8.1*
|
||||
|
||||
Patch to fix session file when using multiple tab pages. (Jason Franklin, 2019
|
||||
May 20)
|
||||
Also put :argadd commands at the start for all buffers, so that their order
|
||||
@@ -230,6 +243,8 @@ Should do current file first and not split it up when more results are found.
|
||||
Undo history wrong when ":next file" re-uses a buffer. (#5426)
|
||||
ex_next() should pass flag to do_argfile(), then to do_ecmd().
|
||||
|
||||
Patch to add "note" type to quickfix. (#5527) Missing tests.
|
||||
|
||||
Adding "10" to 'spellsuggest' causes spell suggestions to become very slow.
|
||||
(#4087)
|
||||
|
||||
@@ -238,9 +253,6 @@ match, total matches). (#5631)
|
||||
Patch to provide search stats in a variable, so that it can be used in the
|
||||
statusline. (Fujiwara Takuya, #4446)
|
||||
|
||||
":helptags ALL" should skip directories where "tags" cannot be written.
|
||||
(Matěj Cepl, #5026)
|
||||
|
||||
":bnext" in a help buffer is supposed to go to the next help buffer, but it
|
||||
goes to any buffer, and then :bnext skips help buffers, since they are
|
||||
unlisted. (#4478)
|
||||
@@ -302,6 +314,8 @@ Does not build with MinGW out of the box:
|
||||
Crash when mixing matchadd and substitute()? (Max Christian Pohle, 2018 May
|
||||
13, #2910) Can't reproduce?
|
||||
|
||||
Display messed up with matchparen, wrapping and scrolling. (#5638)
|
||||
|
||||
Patch to configure BUILD_DATE for reproducible builds. (James McCoy, #513)
|
||||
|
||||
Patch to add MODIFIED_BY to MSVC build file. (Chen Lei, 2016 Nov 24, #1275)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
*vim9.txt* For Vim version 8.2. Last change: 2020 Feb 21
|
||||
*vim9.txt* For Vim version 8.2. Last change: 2020 Feb 22
|
||||
|
||||
|
||||
VIM REFERENCE MANUAL by Bram Moolenaar
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
"
|
||||
" Author: Bram Moolenaar
|
||||
" Copyright: Vim license applies, see ":help license"
|
||||
" Last Change: 2019 Dec 11
|
||||
" Last Change: 2020 Feb 19
|
||||
"
|
||||
" WORK IN PROGRESS - Only the basics work
|
||||
" Note: On MS-Windows you need a recent version of gdb. The one included with
|
||||
|
||||
@@ -2,12 +2,14 @@
|
||||
" Language: resolver configuration file
|
||||
" Maintainer: Radu Dineiu <radu.dineiu@gmail.com>
|
||||
" URL: https://raw.github.com/rid9/vim-resolv/master/resolv.vim
|
||||
" Last Change: 2013 May 21
|
||||
" Version: 1.0
|
||||
" Last Change: 2020 Feb 15
|
||||
" By: DJ Lucas
|
||||
" Version: 1.1
|
||||
"
|
||||
" Credits:
|
||||
" David Necas (Yeti) <yeti@physics.muni.cz>
|
||||
" Stefano Zacchiroli <zack@debian.org>
|
||||
" DJ Lucas <dj@linuxfromscratch.org>
|
||||
|
||||
" quit when a syntax file was already loaded
|
||||
if exists("b:current_syntax")
|
||||
@@ -31,6 +33,15 @@ syn match resolvHostname contained /\w\{-}\.[-0-9A-Za-z_\.]*/
|
||||
|
||||
" Particular
|
||||
syn match resolvIPNameserver contained /\%(\%(\d\{1,4}\.\)\{3}\d\{1,4}\%(\s\|$\)\)\+/ contains=@resolvIPCluster
|
||||
syn match resolvIPNameserver contained /\<\(\x\{1,4}:\)\{6}\(\x\{1,4}:\x\{1,4}\)\>/
|
||||
syn match resolvIPNameserver contained /\s\@<=::\(\(\x\{1,4}:\)\{,6}\x\{1,4}\)\>/
|
||||
syn match resolvIPNameserver contained /\<\(\x\{1,4}:\)\{1}:\(\(\x\{1,4}:\)\{,5}\x\{1,4}\)\>/
|
||||
syn match resolvIPNameserver contained /\<\(\x\{1,4}:\)\{2}:\(\(\x\{1,4}:\)\{,4}\x\{1,4}\)\>/
|
||||
syn match resolvIPNameserver contained /\<\(\x\{1,4}:\)\{3}:\(\(\x\{1,4}:\)\{,3}\x\{1,4}\)\>/
|
||||
syn match resolvIPNameserver contained /\<\(\x\{1,4}:\)\{4}:\(\(\x\{1,4}:\)\{,2}\x\{1,4}\)\>/
|
||||
syn match resolvIPNameserver contained /\<\(\x\{1,4}:\)\{5}:\(\(\x\{1,4}:\)\{,1}\x\{1,4}\)\>/
|
||||
syn match resolvIPNameserver contained /\<\(\x\{1,4}:\)\{6}:\x\{1,4}\>/
|
||||
syn match resolvIPNameserver contained /\<\(\x\{1,4}:\)\{1,7}:\(\s\|;\|$\)\@=/
|
||||
syn match resolvHostnameSearch contained /\%(\%([-0-9A-Za-z_]\+\.\)*[-0-9A-Za-z_]\+\.\?\%(\s\|$\)\)\+/
|
||||
syn match resolvIPNetmaskSortList contained /\%(\%(\d\{1,4}\.\)\{3}\d\{1,4}\%(\/\%(\%(\d\{1,4}\.\)\{,3}\d\{1,4}\)\)\?\%(\s\|$\)\)\+/ contains=resolvOperator,@resolvIPCluster
|
||||
|
||||
|
||||
@@ -131,8 +131,8 @@ NOTA: Enquanto segue este tutorial, n
|
||||
|
||||
---> Há algum texto faltando nes
|
||||
Há algum texto faltando nesta linha.
|
||||
Há algum texto faltan
|
||||
---> Há algum texto faltando aqui.
|
||||
---> Há algum texto faltan
|
||||
Há algum texto faltando aqui.
|
||||
|
||||
5. Quando se sentir confortável adicionando texto, vá para a Lição 1.6.
|
||||
|
||||
|
||||
@@ -131,8 +131,8 @@ NOTA: Enquanto segue este tutorial, não tente memorizar, aprenda pelo uso.
|
||||
|
||||
---> Há algum texto faltando nes
|
||||
Há algum texto faltando nesta linha.
|
||||
Há algum texto faltan
|
||||
---> Há algum texto faltando aqui.
|
||||
---> Há algum texto faltan
|
||||
Há algum texto faltando aqui.
|
||||
|
||||
5. Quando se sentir confortável adicionando texto, vá para a Lição 1.6.
|
||||
|
||||
|
||||
+6
-3
@@ -663,9 +663,6 @@ OPTFLAG = /Ox
|
||||
! if "$(OPTIMIZE)" != "SPACE"
|
||||
OPTFLAG = $(OPTFLAG) /GL
|
||||
! endif
|
||||
# Visual Studio 2005 has 'deprecated' many of the standard CRT functions
|
||||
CFLAGS_DEPR = /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE
|
||||
CFLAGS = $(CFLAGS) $(CFLAGS_DEPR)
|
||||
! endif
|
||||
|
||||
# (/Wp64 is deprecated in VC9 and generates an obnoxious warning.)
|
||||
@@ -707,6 +704,12 @@ CFLAGS = $(CFLAGS) /Zl /MTd
|
||||
! endif
|
||||
!endif # DEBUG
|
||||
|
||||
!if $(MSVC_MAJOR) >= 8
|
||||
# Visual Studio 2005 has 'deprecated' many of the standard CRT functions
|
||||
CFLAGS_DEPR = /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE
|
||||
CFLAGS = $(CFLAGS) $(CFLAGS_DEPR)
|
||||
!endif
|
||||
|
||||
!include Make_all.mak
|
||||
!include testdir\Make_all.mak
|
||||
|
||||
|
||||
+1
-1
@@ -389,7 +389,7 @@ calc_hist_idx(int histype, int num)
|
||||
i += hislen;
|
||||
wrapped = TRUE;
|
||||
}
|
||||
if (hist[i].hisnum == num && hist[i].hisstr != NULL)
|
||||
if (i >= 0 && hist[i].hisnum == num && hist[i].hisstr != NULL)
|
||||
return i;
|
||||
}
|
||||
else if (-num <= hislen)
|
||||
|
||||
@@ -671,6 +671,7 @@ heredoc_get(exarg_T *eap, char_u *cmd)
|
||||
* ":let var ..= expr" assignment command.
|
||||
* ":let [var1, var2] = expr" unpack list.
|
||||
* ":let var =<< ..." heredoc
|
||||
* ":let var: string" Vim9 declaration
|
||||
*/
|
||||
void
|
||||
ex_let(exarg_T *eap)
|
||||
|
||||
@@ -403,10 +403,12 @@ EXTERN type_T t_dict_any INIT4(VAR_DICT, 0, &t_any, NULL);
|
||||
EXTERN type_T t_list_empty INIT4(VAR_LIST, 0, &t_void, NULL);
|
||||
EXTERN type_T t_dict_empty INIT4(VAR_DICT, 0, &t_void, NULL);
|
||||
|
||||
EXTERN type_T t_list_bool INIT4(VAR_LIST, 0, &t_bool, NULL);
|
||||
EXTERN type_T t_list_number INIT4(VAR_LIST, 0, &t_number, NULL);
|
||||
EXTERN type_T t_list_string INIT4(VAR_LIST, 0, &t_string, NULL);
|
||||
EXTERN type_T t_list_dict_any INIT4(VAR_LIST, 0, &t_dict_any, NULL);
|
||||
|
||||
EXTERN type_T t_dict_bool INIT4(VAR_DICT, 0, &t_bool, NULL);
|
||||
EXTERN type_T t_dict_number INIT4(VAR_DICT, 0, &t_number, NULL);
|
||||
EXTERN type_T t_dict_string INIT4(VAR_DICT, 0, &t_string, NULL);
|
||||
|
||||
|
||||
+1
-1
@@ -1641,7 +1641,7 @@ LineToString(const char *str)
|
||||
{
|
||||
PyObject *result;
|
||||
Py_ssize_t len = strlen(str);
|
||||
char *tmp,*p;
|
||||
char *tmp, *p;
|
||||
|
||||
tmp = alloc(len + 1);
|
||||
p = tmp;
|
||||
|
||||
+2
-2
@@ -194,7 +194,7 @@ json_encode_item(garray_T *gap, typval_T *val, int copyID, int options)
|
||||
switch (val->v_type)
|
||||
{
|
||||
case VAR_BOOL:
|
||||
switch (val->vval.v_number)
|
||||
switch ((long)val->vval.v_number)
|
||||
{
|
||||
case VVAL_FALSE: ga_concat(gap, (char_u *)"false"); break;
|
||||
case VVAL_TRUE: ga_concat(gap, (char_u *)"true"); break;
|
||||
@@ -202,7 +202,7 @@ json_encode_item(garray_T *gap, typval_T *val, int copyID, int options)
|
||||
break;
|
||||
|
||||
case VAR_SPECIAL:
|
||||
switch (val->vval.v_number)
|
||||
switch ((long)val->vval.v_number)
|
||||
{
|
||||
case VVAL_NONE: if ((options & JSON_JS) != 0
|
||||
&& (options & JSON_NO_NONE) == 0)
|
||||
|
||||
+384
-137
@@ -17,8 +17,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Vim 8.1\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2019-11-10 22:35+0100\n"
|
||||
"PO-Revision-Date: 2019-11-10 22:50+0100\n"
|
||||
"POT-Creation-Date: 2020-02-15 21:05+0100\n"
|
||||
"PO-Revision-Date: 2020-02-15 23:59+0100\n"
|
||||
"Last-Translator: Dominique PELLÉ <dominique.pelle@gmail.com>\n"
|
||||
"Language-Team: Esperanto\n"
|
||||
"Language: eo\n"
|
||||
@@ -58,7 +58,7 @@ msgstr "W19: Forviŝo de augroup kiu estas ankoraŭ uzata"
|
||||
|
||||
#, c-format
|
||||
msgid "E215: Illegal character after *: %s"
|
||||
msgstr "E215: Nevalida signo malantaŭ *: %s"
|
||||
msgstr "E215: Nevalida signo post *: %s"
|
||||
|
||||
#, c-format
|
||||
msgid "E216: No such event: %s"
|
||||
@@ -543,22 +543,6 @@ msgstr "%3d %s %s linio %ld"
|
||||
msgid "%3d expr %s"
|
||||
msgstr "%3d espr %s"
|
||||
|
||||
#, c-format
|
||||
msgid "E720: Missing colon in Dictionary: %s"
|
||||
msgstr "E720: Mankas dupunkto en la vortaro: %s"
|
||||
|
||||
#, c-format
|
||||
msgid "E721: Duplicate key in Dictionary: \"%s\""
|
||||
msgstr "E721: Ripetita ŝlosilo en la vortaro: \"%s\""
|
||||
|
||||
#, c-format
|
||||
msgid "E722: Missing comma in Dictionary: %s"
|
||||
msgstr "E722: Mankas komo en la vortaro: %s"
|
||||
|
||||
#, c-format
|
||||
msgid "E723: Missing end of Dictionary '}': %s"
|
||||
msgstr "E723: Mankas fino de vortaro '}': %s"
|
||||
|
||||
msgid "extend() argument"
|
||||
msgstr "argumento de extend()"
|
||||
|
||||
@@ -705,18 +689,12 @@ msgstr "E105: Uzo de \":loadkeymap\" nur eblas en vim-skripto"
|
||||
msgid "E791: Empty keymap entry"
|
||||
msgstr "E791: Malplena rikordo en klavmapo"
|
||||
|
||||
msgid "E111: Missing ']'"
|
||||
msgstr "E111: Mankas ']'"
|
||||
|
||||
msgid "E719: Cannot use [:] with a Dictionary"
|
||||
msgstr "E719: Uzo de [:] ne eblas kun Vortaro"
|
||||
|
||||
msgid "E806: using Float as a String"
|
||||
msgstr "E806: uzo de Glitpunktnombro kiel Ĉeno"
|
||||
|
||||
msgid "E274: No white space allowed before parenthesis"
|
||||
msgstr "E274: Neniu spaceto permesebla antaŭ ol komenca krampo"
|
||||
|
||||
msgid "E689: Can only index a List, Dictionary or Blob"
|
||||
msgstr "E689: Nur eblas indeksi Liston, Vortaron aŭ BLOB-on"
|
||||
|
||||
@@ -741,23 +719,8 @@ msgstr "E711: Lista valoro ne havas sufiĉe da eroj"
|
||||
msgid "E996: Cannot lock a list or dict"
|
||||
msgstr "E996: Ne eblas ŝlosi liston aŭ vortaron"
|
||||
|
||||
msgid "E690: Missing \"in\" after :for"
|
||||
msgstr "E690: \"in\" mankas malantaŭ \":for\""
|
||||
|
||||
msgid "E109: Missing ':' after '?'"
|
||||
msgstr "E109: Mankas ':' malantaŭ '?'"
|
||||
|
||||
msgid "E804: Cannot use '%' with Float"
|
||||
msgstr "E804: Ne eblas uzi '%' kun Glitpunktnombro"
|
||||
|
||||
msgid "E973: Blob literal should have an even number of hex characters"
|
||||
msgstr "E973: BLOB-a literalo devus havi paran nombron de deksesumaj signoj"
|
||||
|
||||
msgid "E110: Missing ')'"
|
||||
msgstr "E110: Mankas ')'"
|
||||
|
||||
msgid "E260: Missing name after ->"
|
||||
msgstr "E260: Mankas nomo malantaŭ ->"
|
||||
msgstr "E260: Mankas nomo post ->"
|
||||
|
||||
msgid "E695: Cannot index a Funcref"
|
||||
msgstr "E695: Ne eblas indeksi Funcref"
|
||||
@@ -769,9 +732,8 @@ msgstr "E909: Ne eblas indeksi specialan variablon"
|
||||
msgid "E112: Option name missing: %s"
|
||||
msgstr "E112: Mankas nomo de opcio: %s"
|
||||
|
||||
#, c-format
|
||||
msgid "E113: Unknown option: %s"
|
||||
msgstr "E113: Nekonata opcio: %s"
|
||||
msgid "E973: Blob literal should have an even number of hex characters"
|
||||
msgstr "E973: BLOB-a literalo devus havi paran nombron de deksesumaj signoj"
|
||||
|
||||
#, c-format
|
||||
msgid "E114: Missing quote: %s"
|
||||
@@ -820,6 +782,9 @@ msgstr "E893: Uzo de Listo kiel Glitpunktnombro"
|
||||
msgid "E894: Using a Dictionary as a Float"
|
||||
msgstr "E894: Uzo de Vortaro kiel Glitpunktnombro"
|
||||
|
||||
msgid "E362: Using a boolean value as a Float"
|
||||
msgstr "E362: Uzo de bulea valoro kiel Glitpunktnombro"
|
||||
|
||||
msgid "E907: Using a special value as a Float"
|
||||
msgstr "E907: Uzo de speciala valoro kiel Glitpunktnombro"
|
||||
|
||||
@@ -844,9 +809,6 @@ msgstr "E731: uzo de Vortaro kiel Ĉeno"
|
||||
msgid "E976: using Blob as a String"
|
||||
msgstr "E976: uzo de BLOB-o kiel Ĉeno"
|
||||
|
||||
msgid "E908: using an invalid value as a String"
|
||||
msgstr "E908: uzo de nevalida valoro kiel Ĉeno"
|
||||
|
||||
msgid "E698: variable nested too deep for making a copy"
|
||||
msgstr "E698: variablo ingita tro profunde por fari kopion"
|
||||
|
||||
@@ -857,9 +819,6 @@ msgstr ""
|
||||
"\n"
|
||||
"\tLaste ŝaltita de "
|
||||
|
||||
msgid " line "
|
||||
msgstr " linio "
|
||||
|
||||
msgid "E977: Can only compare Blob with Blob"
|
||||
msgstr "E977: Eblas nur kompari BLOB-on kun BLOB-o"
|
||||
|
||||
@@ -946,16 +905,10 @@ msgstr "E258: Ne eblas sendi al kliento"
|
||||
msgid "E962: Invalid action: '%s'"
|
||||
msgstr "E962: Nevalida ago: '%s'"
|
||||
|
||||
msgid "(Invalid)"
|
||||
msgstr "(Nevalida)"
|
||||
|
||||
#, c-format
|
||||
msgid "E935: invalid submatch number: %d"
|
||||
msgstr "E935: nevalida indekso de \"submatch\": %d"
|
||||
|
||||
msgid "E18: Unexpected characters in :let"
|
||||
msgstr "E18: Neatenditaj signoj en \":let\""
|
||||
|
||||
msgid "E991: cannot use =<< here"
|
||||
msgstr "E991: ne eblas uzi =<< ĉi tie"
|
||||
|
||||
@@ -970,7 +923,7 @@ msgid "E990: Missing end marker '%s'"
|
||||
msgstr "E990: Mankas fina markilo '%s'"
|
||||
|
||||
msgid "E985: .= is not supported with script version 2"
|
||||
msgstr "E985: .= ne estas subtenata kun versio 2 de vim scripto"
|
||||
msgstr "E985: .= ne estas subtenata kun versio 2 de vim-skripto"
|
||||
|
||||
msgid "E687: Less targets than List items"
|
||||
msgstr "E687: Malpli da celoj ol Listeroj"
|
||||
@@ -988,9 +941,6 @@ msgstr "E738: Ne eblas listigi variablojn de %s"
|
||||
msgid "E996: Cannot lock an environment variable"
|
||||
msgstr "E996: Ne eblas ŝlosi medivariablon"
|
||||
|
||||
msgid "E996: Cannot lock an option"
|
||||
msgstr "E996: Ne eblas ŝlosi opcion"
|
||||
|
||||
msgid "E996: Cannot lock a register"
|
||||
msgstr "E996: Ne eblas ŝlosi reĝistron"
|
||||
|
||||
@@ -1005,6 +955,13 @@ msgstr "E940: Ne eblas ŝlosi aŭ malŝlosi variablon %s"
|
||||
msgid "E743: variable nested too deep for (un)lock"
|
||||
msgstr "E743: variablo ingita tro profunde por (mal)ŝlosi"
|
||||
|
||||
msgid "E1063: type mismatch for v: variable"
|
||||
msgstr "E1063: nekongrua tipo por v:-variablo"
|
||||
|
||||
#, c-format
|
||||
msgid "E1041: Redefining script item %s"
|
||||
msgstr "E1041: Redifino de skriptero %s"
|
||||
|
||||
#, c-format
|
||||
msgid "E963: setting %s to value with wrong type"
|
||||
msgstr "E963: valorizo de %s kun valoro de neĝusta tipo"
|
||||
@@ -1254,11 +1211,13 @@ msgstr "E666: kompililo nesubtenata: %s"
|
||||
|
||||
#, c-format
|
||||
msgid "W20: Required python version 2.x not supported, ignoring file: %s"
|
||||
msgstr "W20: Pitono versio 2.x bezonata sed nesubtenata, ignoro de dosiero: %s"
|
||||
msgstr ""
|
||||
"W20: versio de Pitono 2.x bezonata sed nesubtenata, ignoro de dosiero: %s"
|
||||
|
||||
#, c-format
|
||||
msgid "W21: Required python version 3.x not supported, ignoring file: %s"
|
||||
msgstr "W21: pitono versio 3.x bezonata sed nesubtenata, ignoro de dosiero: %s"
|
||||
msgstr ""
|
||||
"W21: versio de Pitono 3.x bezonata sed nesubtenata, ignoro de dosiero: %s"
|
||||
|
||||
#, c-format
|
||||
msgid "Current %slanguage: \"%s\""
|
||||
@@ -1503,30 +1462,15 @@ msgstr "Interrompo"
|
||||
msgid "E579: :if nesting too deep"
|
||||
msgstr "E579: \":if\" tro profunde ingita"
|
||||
|
||||
msgid "E580: :endif without :if"
|
||||
msgstr "E580: \":endif\" sen \":if\""
|
||||
|
||||
msgid "E581: :else without :if"
|
||||
msgstr "E581: \":else\" sen \":if\""
|
||||
|
||||
msgid "E582: :elseif without :if"
|
||||
msgstr "E582: \":elseif\" sen \":if\""
|
||||
|
||||
msgid "E583: multiple :else"
|
||||
msgstr "E583: pluraj \":else\""
|
||||
|
||||
msgid "E584: :elseif after :else"
|
||||
msgstr "E584: \":elseif\" malantaŭ \":else\""
|
||||
msgstr "E584: \":elseif\" post \":else\""
|
||||
|
||||
msgid "E585: :while/:for nesting too deep"
|
||||
msgstr "E585: \":while/:for\" ingita tro profunde"
|
||||
|
||||
msgid "E586: :continue without :while or :for"
|
||||
msgstr "E586: \":continue\" sen \":while\" aŭ \":for\""
|
||||
|
||||
msgid "E587: :break without :while or :for"
|
||||
msgstr "E587: \":break\" sen \":while\" aŭ \":for\""
|
||||
|
||||
msgid "E732: Using :endfor with :while"
|
||||
msgstr "E732: Uzo de \":endfor\" kun \":while\""
|
||||
|
||||
@@ -1536,20 +1480,8 @@ msgstr "E733: Uzo de \":endwhile\" kun \":for\""
|
||||
msgid "E601: :try nesting too deep"
|
||||
msgstr "E601: \":try\" ingita tro profunde"
|
||||
|
||||
msgid "E603: :catch without :try"
|
||||
msgstr "E603: \":catch\" sen \":try\""
|
||||
|
||||
msgid "E604: :catch after :finally"
|
||||
msgstr "E604: \":catch\" malantaŭ \":finally\""
|
||||
|
||||
msgid "E606: :finally without :try"
|
||||
msgstr "E606: \":finally\" sen \":try\""
|
||||
|
||||
msgid "E607: multiple :finally"
|
||||
msgstr "E607: pluraj \":finally\""
|
||||
|
||||
msgid "E602: :endtry without :try"
|
||||
msgstr "E602: \":endtry\" sen \":try\""
|
||||
msgstr "E604: \":catch\" post \":finally\""
|
||||
|
||||
msgid "E193: :endfunction not inside a function"
|
||||
msgstr "E193: \":endfunction\" ekster funkcio"
|
||||
@@ -1650,7 +1582,7 @@ msgid "[unix]"
|
||||
msgstr "[unikso]"
|
||||
|
||||
msgid "[unix format]"
|
||||
msgstr "[formato unikso]"
|
||||
msgstr "[uniksa formato]"
|
||||
|
||||
#, c-format
|
||||
msgid "%ld line, "
|
||||
@@ -2103,9 +2035,6 @@ msgstr "Stilo:"
|
||||
msgid "Size:"
|
||||
msgstr "Grando:"
|
||||
|
||||
msgid "E256: Hangul automata ERROR"
|
||||
msgstr "E256: ERARO en aŭtomato de korea alfabeto"
|
||||
|
||||
msgid "E550: Missing colon"
|
||||
msgstr "E550: Mankas dupunkto"
|
||||
|
||||
@@ -2827,10 +2756,10 @@ msgid "Too many edit arguments"
|
||||
msgstr "Tro da argumentoj de redakto"
|
||||
|
||||
msgid "Argument missing after"
|
||||
msgstr "Argumento mankas malantaŭ"
|
||||
msgstr "Argumento mankas post"
|
||||
|
||||
msgid "Garbage after option argument"
|
||||
msgstr "Forĵetindaĵo malantaŭ argumento de opcio"
|
||||
msgstr "Forĵetindaĵo post argumento de opcio"
|
||||
|
||||
msgid "Too many \"+command\", \"-c command\" or \"--cmd command\" arguments"
|
||||
msgstr "Tro da argumentoj \"+komando\", \"-c komando\" aŭ \"--cmd komando\""
|
||||
@@ -2935,7 +2864,7 @@ msgstr ""
|
||||
"Argumentoj:\n"
|
||||
|
||||
msgid "--\t\t\tOnly file names after this"
|
||||
msgstr "--\t\t\tNur dosiernomoj malantaŭ tio"
|
||||
msgstr "--\t\t\tNur dosiernomoj post tio"
|
||||
|
||||
msgid "--literal\t\tDon't expand wildcards"
|
||||
msgstr "--literal\t\tNe malvolvi ĵokerojn"
|
||||
@@ -3284,7 +3213,7 @@ msgstr "E357: 'langmap': Kongrua signo mankas por %s"
|
||||
|
||||
#, c-format
|
||||
msgid "E358: 'langmap': Extra characters after semicolon: %s"
|
||||
msgstr "E358: 'langmap': Ekstraj signoj malantaŭ punktokomo: %s"
|
||||
msgstr "E358: 'langmap': Ekstraj signoj post punktokomo: %s"
|
||||
|
||||
msgid "No marks set"
|
||||
msgstr "Neniu marko"
|
||||
@@ -3564,9 +3493,6 @@ msgstr " En dosierujo "
|
||||
msgid " -- none --\n"
|
||||
msgstr " -- nenio --\n"
|
||||
|
||||
msgid "%a %b %d %H:%M:%S %Y"
|
||||
msgstr "%a %b %d %H:%M;%S %Y"
|
||||
|
||||
msgid " owned by: "
|
||||
msgstr " posedata de: "
|
||||
|
||||
@@ -3945,12 +3871,6 @@ msgstr "Bip!"
|
||||
msgid "E677: Error writing temp file"
|
||||
msgstr "E677: Eraro dum skribo de provizora dosiero"
|
||||
|
||||
#, c-format
|
||||
msgid "%ld second ago"
|
||||
msgid_plural "%ld seconds ago"
|
||||
msgstr[0] "antaŭ %ld sekundo"
|
||||
msgstr[1] "antaŭ %ld sekundoj"
|
||||
|
||||
msgid "ERROR: "
|
||||
msgstr "ERARO: "
|
||||
|
||||
@@ -4122,7 +4042,7 @@ msgid "E846: Key code not set"
|
||||
msgstr "E846: Klavkodo ne agordita"
|
||||
|
||||
msgid "E521: Number required after ="
|
||||
msgstr "E521: Nombro bezonata malantaŭ ="
|
||||
msgstr "E521: Nombro bezonata post ="
|
||||
|
||||
msgid "E522: Not found in termcap"
|
||||
msgstr "E522: Netrovita en termcap"
|
||||
@@ -4236,7 +4156,7 @@ msgstr "E525: Ĉeno de nula longo"
|
||||
|
||||
#, c-format
|
||||
msgid "E526: Missing number after <%s>"
|
||||
msgstr "E526: Mankas nombro malantaŭ <%s>"
|
||||
msgstr "E526: Mankas nombro post <%s>"
|
||||
|
||||
msgid "E527: Missing comma"
|
||||
msgstr "E527: Mankas komo"
|
||||
@@ -4264,7 +4184,7 @@ msgstr "E534: Nevalida larĝa tiparo"
|
||||
|
||||
#, c-format
|
||||
msgid "E535: Illegal character after <%c>"
|
||||
msgstr "E535: Nevalida signo malantaŭ <%c>"
|
||||
msgstr "E535: Nevalida signo post <%c>"
|
||||
|
||||
msgid "E536: comma required"
|
||||
msgstr "E536: komo bezonata"
|
||||
@@ -4284,7 +4204,7 @@ msgstr "Bezonas version 2.04 de Amigados aŭ pli novan\n"
|
||||
|
||||
#, c-format
|
||||
msgid "Need %s version %ld\n"
|
||||
msgstr "Bezonas %s-on versio %ld\n"
|
||||
msgstr "Bezonas %s-on de versio %ld\n"
|
||||
|
||||
msgid "Cannot open NIL:\n"
|
||||
msgstr "Ne eblas malfermi NIL:\n"
|
||||
@@ -4499,8 +4419,8 @@ msgstr "Averto de Vim"
|
||||
msgid "shell returned %d"
|
||||
msgstr "la ŝelo liveris %d"
|
||||
|
||||
msgid "E278: Cannot put a terminal buffer in a popup window"
|
||||
msgstr "E278: Ne eblas meti bufron de terminalo en ŝprucfenestro"
|
||||
msgid "E450: buffer number, text or a list required"
|
||||
msgstr "E450: numero de bufro, teksto aŭ listo bezonata"
|
||||
|
||||
#, c-format
|
||||
msgid "E997: Tabpage not found: %d"
|
||||
@@ -4513,6 +4433,9 @@ msgstr "E993: fenestro %d ne estas ŝprucfenestro"
|
||||
msgid "E994: Not allowed in a popup window"
|
||||
msgstr "E994: Nepermesebla en ŝprucfenestro"
|
||||
|
||||
msgid "E863: Not allowed for a terminal in a popup window"
|
||||
msgstr "E863: Nepermesebla por terminalo en ŝprucfenestro"
|
||||
|
||||
msgid "E750: First use \":profile start {fname}\""
|
||||
msgstr "E750: Uzu unue \":profile start {dosiernomo}\""
|
||||
|
||||
@@ -4603,7 +4526,7 @@ msgstr "E369: nevalida ano en %s%%[]"
|
||||
|
||||
#, c-format
|
||||
msgid "E769: Missing ] after %s["
|
||||
msgstr "E769: Mankas ] malantaŭ %s["
|
||||
msgstr "E769: Mankas ] post %s["
|
||||
|
||||
msgid "E944: Reverse range in character class"
|
||||
msgstr "E944: Inversa amplekso en klaso de signoj"
|
||||
@@ -4632,7 +4555,7 @@ msgstr "E67: \\z1 kaj aliaj estas nepermeseblaj tie"
|
||||
|
||||
#, c-format
|
||||
msgid "E69: Missing ] after %s%%["
|
||||
msgstr "E69: Mankas ] malantaŭ %s%%["
|
||||
msgstr "E69: Mankas ] post %s%%["
|
||||
|
||||
#, c-format
|
||||
msgid "E70: Empty %s%%[]"
|
||||
@@ -4670,19 +4593,19 @@ msgid "E64: %s%c follows nothing"
|
||||
msgstr "E64: %s%c sekvas nenion"
|
||||
|
||||
msgid "E68: Invalid character after \\z"
|
||||
msgstr "E68: Nevalida signo malantaŭ \\z"
|
||||
msgstr "E68: Nevalida signo post \\z"
|
||||
|
||||
#, c-format
|
||||
msgid "E678: Invalid character after %s%%[dxouU]"
|
||||
msgstr "E678: Nevalida signo malantaŭ %s%%[dxouU]"
|
||||
msgstr "E678: Nevalida signo post %s%%[dxouU]"
|
||||
|
||||
#, c-format
|
||||
msgid "E71: Invalid character after %s%%"
|
||||
msgstr "E71: Nevalida signo malantaŭ %s%%"
|
||||
msgstr "E71: Nevalida signo post %s%%"
|
||||
|
||||
#, c-format
|
||||
msgid "E59: invalid character after %s@"
|
||||
msgstr "E59: nevalida signo malantaŭ %s@"
|
||||
msgstr "E59: nevalida signo post %s@"
|
||||
|
||||
#, c-format
|
||||
msgid "E60: Too many complex %s{...}s"
|
||||
@@ -4937,6 +4860,9 @@ msgstr "E167: \":scriptencoding\" uzita ekster rulita dosiero"
|
||||
msgid "E984: :scriptversion used outside of a sourced file"
|
||||
msgstr "E984: :scriptversion uzita ekster rulita dosiero"
|
||||
|
||||
msgid "E1040: Cannot use :scriptversion after :vim9script"
|
||||
msgstr "E1040: Ne eblas uzi :scriptversion post :vim9script"
|
||||
|
||||
#, c-format
|
||||
msgid "E999: scriptversion not supported: %d"
|
||||
msgstr "E999: scriptversion ne subtenata: %d"
|
||||
@@ -4957,7 +4883,7 @@ msgid "E385: search hit BOTTOM without match for: %s"
|
||||
msgstr "E385: serĉo atingis SUBON sen trovi: %s"
|
||||
|
||||
msgid "E386: Expected '?' or '/' after ';'"
|
||||
msgstr "E386: Atendis '?' aŭ '/' malantaŭ ';'"
|
||||
msgstr "E386: Atendis '?' aŭ '/' post ';'"
|
||||
|
||||
msgid " (includes previously listed match)"
|
||||
msgstr " (enhavas antaŭe listigitajn kongruojn)"
|
||||
@@ -5547,7 +5473,7 @@ msgstr "E789: Mankas ']': %s"
|
||||
|
||||
#, c-format
|
||||
msgid "E890: trailing char after ']': %s]%s"
|
||||
msgstr "E890: vosta signo malantaŭ ']': %s]%s"
|
||||
msgstr "E890: vosta signo post ']': %s]%s"
|
||||
|
||||
#, c-format
|
||||
msgid "E398: Missing '=': %s"
|
||||
@@ -5569,7 +5495,7 @@ msgstr "E401: Disigilo de ŝablono netrovita: %s"
|
||||
|
||||
#, c-format
|
||||
msgid "E402: Garbage after pattern: %s"
|
||||
msgstr "E402: Forĵetindaĵo malantaŭ ŝablono: %s"
|
||||
msgstr "E402: Forĵetindaĵo post ŝablono: %s"
|
||||
|
||||
msgid "E403: syntax sync: line continuations pattern specified twice"
|
||||
msgstr "E403: sintaksa sinkronigo: ŝablono de linia daŭrigo specifita dufoje"
|
||||
@@ -5803,6 +5729,18 @@ msgstr "E969: tipo de eco %s jam difinita"
|
||||
msgid "E970: Unknown highlight group name: '%s'"
|
||||
msgstr "E970: Nekonata nomo de emfaza grupo: '%s'"
|
||||
|
||||
msgid "(Invalid)"
|
||||
msgstr "(Nevalida)"
|
||||
|
||||
msgid "%a %b %d %H:%M:%S %Y"
|
||||
msgstr "%a %b %d %H:%M;%S %Y"
|
||||
|
||||
#, c-format
|
||||
msgid "%ld second ago"
|
||||
msgid_plural "%ld seconds ago"
|
||||
msgstr[0] "antaŭ %ld sekundo"
|
||||
msgstr[1] "antaŭ %ld sekundoj"
|
||||
|
||||
msgid "new shell started\n"
|
||||
msgstr "nova ŝelo lanĉita\n"
|
||||
|
||||
@@ -6026,8 +5964,14 @@ msgstr "E125: Nevalida argumento: %s"
|
||||
msgid "E853: Duplicate argument name: %s"
|
||||
msgstr "E853: Ripetita nomo de argumento: %s"
|
||||
|
||||
msgid "E1059: No white space allowed before :"
|
||||
msgstr "E1059: Neniu spaceto permesebla antaŭ :"
|
||||
|
||||
msgid "E1055: Missing name after ..."
|
||||
msgstr "E1055: Mankas nomo post ..."
|
||||
|
||||
msgid "E989: Non-default argument follows default argument"
|
||||
msgstr "E989: Ne defaŭlta argumento malantaŭ defaŭlta argumento"
|
||||
msgstr "E989: Ne defaŭlta argumento post defaŭlta argumento"
|
||||
|
||||
#, c-format
|
||||
msgid "E740: Too many arguments for function %s"
|
||||
@@ -6059,22 +6003,10 @@ msgstr "%s liveras %s"
|
||||
msgid "E699: Too many arguments"
|
||||
msgstr "E699: Tro da argumentoj"
|
||||
|
||||
#, c-format
|
||||
msgid "E117: Unknown function: %s"
|
||||
msgstr "E117: Nekonata funkcio: %s"
|
||||
|
||||
#, c-format
|
||||
msgid "E276: Cannot use function as a method: %s"
|
||||
msgstr "E276: Ne eblas uzi funkcion kiel metodo: %s"
|
||||
|
||||
#, c-format
|
||||
msgid "E933: Function was deleted: %s"
|
||||
msgstr "E933: funkcio estis forviŝita: %s"
|
||||
|
||||
#, c-format
|
||||
msgid "E119: Not enough arguments for function: %s"
|
||||
msgstr "E119: Ne sufiĉe da argumentoj por funkcio: %s"
|
||||
|
||||
#, c-format
|
||||
msgid "E120: Using <SID> not in a script context: %s"
|
||||
msgstr "E120: <SID> estas uzata ekster kunteksto de skripto: %s"
|
||||
@@ -6105,16 +6037,30 @@ msgstr "E124: Mankas '(': %s"
|
||||
msgid "E862: Cannot use g: here"
|
||||
msgstr "E862: Ne eblas uzi g: ĉi tie"
|
||||
|
||||
#, c-format
|
||||
msgid "E1056: expected a type: %s"
|
||||
msgstr "E1056: atendis tipon: %s"
|
||||
|
||||
#, c-format
|
||||
msgid "E932: Closure function should not be at top level: %s"
|
||||
msgstr "E932: Fermo-funkcio devus esti je la plej alta nivelo: %s"
|
||||
|
||||
msgid "E1057: Missing :enddef"
|
||||
msgstr "E1057: Mankas :enddef"
|
||||
|
||||
msgid "E126: Missing :endfunction"
|
||||
msgstr "E126: Mankas \":endfunction\""
|
||||
|
||||
#, c-format
|
||||
msgid "W1001: Text found after :enddef: %s"
|
||||
msgstr "W1001: Teksto trovita post :enddef: %s"
|
||||
|
||||
#, c-format
|
||||
msgid "W22: Text found after :endfunction: %s"
|
||||
msgstr "W22: Teksto trovita malantaŭ :endfunction: %s"
|
||||
msgstr "W22: Teksto trovita post :endfunction: %s"
|
||||
|
||||
msgid "E1058: function nesting too deep"
|
||||
msgstr "E1058: ingado de funkcio tro profunda"
|
||||
|
||||
#, c-format
|
||||
msgid "E707: Function name conflicts with variable: %s"
|
||||
@@ -6442,6 +6388,215 @@ msgstr "tajpu :help register<Enenklavo> por pliaj informoj "
|
||||
msgid "menu Help->Sponsor/Register for information "
|
||||
msgstr "menuo Helpo->Subteni/Registri por pliaj informoj "
|
||||
|
||||
#, c-format
|
||||
msgid "E1001: variable not found: %s"
|
||||
msgstr "E1001: variablo ne trovita: %s"
|
||||
|
||||
#, c-format
|
||||
msgid "E1002: Syntax error at %s"
|
||||
msgstr "E1002: Sintaksa eraro en %s"
|
||||
|
||||
msgid "E1035: wrong argument type for +"
|
||||
msgstr "E1035: nevalida tipo de argumento por +"
|
||||
|
||||
#, c-format
|
||||
msgid "E1036: %c requires number or float arguments"
|
||||
msgstr "E1036: %c bezonas numera aŭ glitpunktnombran argumentojn"
|
||||
|
||||
msgid "E1035: % requires number arguments"
|
||||
msgstr "E1035: % bezonas numerajn argumentojn"
|
||||
|
||||
#, c-format
|
||||
msgid "E1037: Cannot use \"%s\" with %s"
|
||||
msgstr "E1037: Ne eblas uzi \"%s\" kun %s"
|
||||
|
||||
#, c-format
|
||||
msgid "E1037: Cannot compare %s with %s"
|
||||
msgstr "E1037: Ne eblas kompari %s kun %s"
|
||||
|
||||
#, c-format
|
||||
msgid "E1004: white space required before and after '%s'"
|
||||
msgstr "E1004: spacetoj bezonataj ĉirkaŭ '%s'"
|
||||
|
||||
#, c-format
|
||||
msgid "E1006: %s is used as an argument"
|
||||
msgstr "E1006: %s estas uzata kiel argumento"
|
||||
|
||||
msgid "E1007: No white space allowed before <"
|
||||
msgstr "E1007: Neniu spaceto permesebla antaŭ ol <"
|
||||
|
||||
msgid "E1008: Missing <type>"
|
||||
msgstr "E1008: Mankas <type>"
|
||||
|
||||
msgid "E1009: Missing > after type"
|
||||
msgstr "E1009: Mankas > post tipo"
|
||||
|
||||
msgid "E1055: This Vim is not compiled with float support"
|
||||
msgstr "E1055: Tiu Vim ne estis kompilita kun glitpunktnombra eblo."
|
||||
|
||||
#, c-format
|
||||
msgid "E1010: Type not recognized: %s"
|
||||
msgstr "E1010: Tipo nerekonita: %s"
|
||||
|
||||
#, c-format
|
||||
msgid "E1050: Item not found: %s"
|
||||
msgstr "E1050: Ero netrovita: %s"
|
||||
|
||||
#, c-format
|
||||
msgid "E1011: name too long: %s"
|
||||
msgstr "E1011: nomo tro longa: %s"
|
||||
|
||||
#, c-format
|
||||
msgid "E1013: type mismatch, expected %s but got %s"
|
||||
msgstr "E1013: miskongruo de tipo, atendis %s sed ricevis %s"
|
||||
|
||||
#, c-format
|
||||
msgid "E1014: Invalid key: %s"
|
||||
msgstr "E1014: Nevalida ŝlosilo: %s"
|
||||
|
||||
#, c-format
|
||||
msgid "E1015: Name expected: %s"
|
||||
msgstr "E1015: Nomo atendita: %s"
|
||||
|
||||
msgid "E1003: Missing return value"
|
||||
msgstr "E1003: Mankas liveraĵo"
|
||||
|
||||
#, c-format
|
||||
msgid "E1052: Cannot declare an option: %s"
|
||||
msgstr "E1052: Ne eblas deklari opcion: %s"
|
||||
|
||||
#, c-format
|
||||
msgid "E1065: Cannot declare an environment variable: %s"
|
||||
msgstr "E1065: Ne eblas deklari medivariablon: %s"
|
||||
|
||||
#, c-format
|
||||
msgid "E1066: Cannot declare a register: %s"
|
||||
msgstr "E1066: Ne eblas deklari reĝistron: %s"
|
||||
|
||||
#, c-format
|
||||
msgid "E1016: Cannot declare a global variable: %s"
|
||||
msgstr "E1016: Ne eblas deklari mallokan variablon %s"
|
||||
|
||||
#, c-format
|
||||
msgid "E1064: Cannot declare a v: variable: %s"
|
||||
msgstr "E1064: Ne eblas deklari v:-variablon %s"
|
||||
|
||||
#, c-format
|
||||
msgid "E1034: Cannot use reserved name %s"
|
||||
msgstr "E1034: Ne eblas uzi rezervitan nomon %s"
|
||||
|
||||
#, c-format
|
||||
msgid "E1017: Variable already declared: %s"
|
||||
msgstr "E1017: Variablo jam deklarita: %s"
|
||||
|
||||
#, c-format
|
||||
msgid "E1018: Cannot assign to a constant: %s"
|
||||
msgstr "E1018: Ne eblas valorizi konstanton: %s"
|
||||
|
||||
#, c-format
|
||||
msgid "E1054: Variable already declared in the script: %s"
|
||||
msgstr "E1054: Variablo jam deklarita en la skripto: %s"
|
||||
|
||||
#, c-format
|
||||
msgid "E1020: cannot use an operator on a new variable: %s"
|
||||
msgstr "E1020: ne eblas uzi operatoron kun nova variablo: %s"
|
||||
|
||||
msgid "E1031: Cannot use void value"
|
||||
msgstr "E1031: Ne eblas uzi vakan valoron"
|
||||
|
||||
msgid "E1021: const requires a value"
|
||||
msgstr "E1021: konstanto bezonas valoron"
|
||||
|
||||
msgid "E1022: type or initialization required"
|
||||
msgstr "E1022: tipo aŭ pravalorizo bezonata"
|
||||
|
||||
#, c-format
|
||||
msgid "E1023: variable already defined: %s"
|
||||
msgstr "E1023: variablo jam difinita: %s"
|
||||
|
||||
msgid "E1024: need a List to iterate over"
|
||||
msgstr "E1024: Listo bezonata por iteracii"
|
||||
|
||||
msgid "E1033: catch unreachable after catch-all"
|
||||
msgstr "E1033: kaptokodobloko neatingebla post kapto de ĉiuj esceptoj"
|
||||
|
||||
#, c-format
|
||||
msgid "E1067: Separator mismatch: %s"
|
||||
msgstr "E1067: Nekongrua disigilo: %s"
|
||||
|
||||
msgid "E1032: missing :catch or :finally"
|
||||
msgstr "E1032: mankas :catch aŭ :finally"
|
||||
|
||||
#, c-format
|
||||
msgid "E488: Trailing characters: %s"
|
||||
msgstr "E488: Vostaj signoj: %s"
|
||||
|
||||
msgid "E1026: Missing }"
|
||||
msgstr "E1026: Mankas }"
|
||||
|
||||
msgid "E1027: Missing return statement"
|
||||
msgstr "E1027: Mankas revenordono"
|
||||
|
||||
#, c-format
|
||||
msgid "E121: Undefined variable: g:%s"
|
||||
msgstr "E121: Nedifinita variablo: g:%s"
|
||||
|
||||
#, c-format
|
||||
msgid "E1060: Invalid environment variable name: %s"
|
||||
msgstr "E1060: Nevalida nomo de medivariablo: %s"
|
||||
|
||||
msgid "E1051: Expected string or number"
|
||||
msgstr "E1051: Atendis ĉenon aŭ nombron"
|
||||
|
||||
#, c-format
|
||||
msgid "E1029: Expected %s but got %s"
|
||||
msgstr "E1029: Atendis %s sed ricevis %s"
|
||||
|
||||
msgid "E1030: Using a String as a Number"
|
||||
msgstr "E1030: Uzo de Ĉeno kiel Nombro"
|
||||
|
||||
msgid "E1042: import/export can only be used in vim9script"
|
||||
msgstr "E1042: importo/eksporto nur uzeblas en vim9script"
|
||||
|
||||
msgid "E1038: vim9script can only be used in a script"
|
||||
msgstr "E1038: :vim9script nur uzeblas en skripto"
|
||||
|
||||
msgid "E1039: vim9script must be the first command in a script"
|
||||
msgstr "E1039: :vim9script devas esti la unua komando en skripto"
|
||||
|
||||
msgid "E1044: export with invalid argument"
|
||||
msgstr "E1044: eksporto kun nevalida argumento"
|
||||
|
||||
msgid "E1043: Invalid command after :export"
|
||||
msgstr "E1043: Nevalida komando post :export"
|
||||
|
||||
msgid "E1045: Missing \"as\" after *"
|
||||
msgstr "E1045: Mankas \"as\" post *"
|
||||
|
||||
msgid "E1045: Missing \"from\""
|
||||
msgstr "E1045: Mankas \"from\""
|
||||
|
||||
msgid "E1045: Invalid string after \"from\""
|
||||
msgstr "E1045: Nevalida ĉeno post \"from\""
|
||||
|
||||
#, c-format
|
||||
msgid "E1053: Could not import \"%s\""
|
||||
msgstr "E1053: Ne eblis importi \"%s\""
|
||||
|
||||
#, c-format
|
||||
msgid "E1049: Item not exported in script: %s"
|
||||
msgstr "E1049: Ero ne estas eksportita en skripto: %s"
|
||||
|
||||
#, c-format
|
||||
msgid "E1048: Item not found in script: %s"
|
||||
msgstr "E1048: Ero ne trovita en skripto: %s"
|
||||
|
||||
msgid "E1046: Missing comma in import"
|
||||
msgstr "E1046: Mankas komo en importo"
|
||||
|
||||
msgid "E1047: syntax error in import"
|
||||
msgstr "E1047: Sintaksa eraro en importo"
|
||||
|
||||
msgid ""
|
||||
"\n"
|
||||
"# Buffer list:\n"
|
||||
@@ -6640,6 +6795,9 @@ msgstr "E814: Ne eblas fermi fenestron, nur la fenestro de aŭtokomandoj restus"
|
||||
msgid "E445: Other window contains changes"
|
||||
msgstr "E445: La alia fenestro enhavas ŝanĝojn"
|
||||
|
||||
msgid "E366: Not allowed to enter a popup window"
|
||||
msgstr "E366: Ne eblas eniri ŝprucfenestron"
|
||||
|
||||
#, c-format
|
||||
msgid "E370: Could not load library %s"
|
||||
msgstr "E370: Ne eblis ŝargi bibliotekon %s"
|
||||
@@ -6705,9 +6863,21 @@ msgstr ""
|
||||
msgid "E171: Missing :endif"
|
||||
msgstr "E171: Mankas \":endif\""
|
||||
|
||||
msgid "E603: :catch without :try"
|
||||
msgstr "E603: \":catch\" sen \":try\""
|
||||
|
||||
msgid "E606: :finally without :try"
|
||||
msgstr "E606: \":finally\" sen \":try\""
|
||||
|
||||
msgid "E607: multiple :finally"
|
||||
msgstr "E607: pluraj \":finally\""
|
||||
|
||||
msgid "E600: Missing :endtry"
|
||||
msgstr "E600: Mankas \":endtry\""
|
||||
|
||||
msgid "E602: :endtry without :try"
|
||||
msgstr "E602: \":endtry\" sen \":try\""
|
||||
|
||||
msgid "E170: Missing :endwhile"
|
||||
msgstr "E170: Mankas \":endwhile\""
|
||||
|
||||
@@ -6974,6 +7144,14 @@ msgstr "E978: Nevalida operacio de BLOB-o"
|
||||
msgid "E118: Too many arguments for function: %s"
|
||||
msgstr "E118: Tro da argumentoj por funkcio: %s"
|
||||
|
||||
#, c-format
|
||||
msgid "E119: Not enough arguments for function: %s"
|
||||
msgstr "E119: Ne sufiĉe da argumentoj por funkcio: %s"
|
||||
|
||||
#, c-format
|
||||
msgid "E933: Function was deleted: %s"
|
||||
msgstr "E933: funkcio estis forviŝita: %s"
|
||||
|
||||
#, c-format
|
||||
msgid "E716: Key not present in Dictionary: %s"
|
||||
msgstr "E716: Ŝlosilo malekzistas en Vortaro: %s"
|
||||
@@ -6992,6 +7170,22 @@ msgstr "E712: Argumento de %s devas esti Listo aŭ Vortaro"
|
||||
msgid "E896: Argument of %s must be a List, Dictionary or Blob"
|
||||
msgstr "E896: Argumento de %s devas esti Listo, Vortaro aŭ BLOB-o"
|
||||
|
||||
msgid "E804: Cannot use '%' with Float"
|
||||
msgstr "E804: Ne eblas uzi '%' kun Glitpunktnombro"
|
||||
|
||||
msgid "E908: using an invalid value as a String"
|
||||
msgstr "E908: uzo de nevalida valoro kiel Ĉeno"
|
||||
|
||||
msgid "E996: Cannot lock an option"
|
||||
msgstr "E996: Ne eblas ŝlosi opcion"
|
||||
|
||||
#, c-format
|
||||
msgid "E113: Unknown option: %s"
|
||||
msgstr "E113: Nekonata opcio: %s"
|
||||
|
||||
msgid "E18: Unexpected characters in :let"
|
||||
msgstr "E18: Neatenditaj signoj en \":let\""
|
||||
|
||||
msgid "E47: Error while reading errorfile"
|
||||
msgstr "E47: Eraro dum legado de erardosiero"
|
||||
|
||||
@@ -7059,6 +7253,25 @@ msgstr "E81: Uzo de <SID> ekster kunteksto de skripto"
|
||||
msgid "E107: Missing parentheses: %s"
|
||||
msgstr "E107: Mankas krampoj: %s"
|
||||
|
||||
msgid "E110: Missing ')'"
|
||||
msgstr "E110: Mankas ')'"
|
||||
|
||||
#, c-format
|
||||
msgid "E720: Missing colon in Dictionary: %s"
|
||||
msgstr "E720: Mankas dupunkto en la vortaro: %s"
|
||||
|
||||
#, c-format
|
||||
msgid "E721: Duplicate key in Dictionary: \"%s\""
|
||||
msgstr "E721: Ripetita ŝlosilo en la vortaro: \"%s\""
|
||||
|
||||
#, c-format
|
||||
msgid "E722: Missing comma in Dictionary: %s"
|
||||
msgstr "E722: Mankas komo en la vortaro: %s"
|
||||
|
||||
#, c-format
|
||||
msgid "E723: Missing end of Dictionary '}': %s"
|
||||
msgstr "E723: Mankas fino de vortaro '}': %s"
|
||||
|
||||
msgid "E449: Invalid expression received"
|
||||
msgstr "E449: Nevalida esprimo ricevita"
|
||||
|
||||
@@ -7108,12 +7321,46 @@ msgstr "E957: Nevalida numero de fenestro"
|
||||
msgid "E686: Argument of %s must be a List"
|
||||
msgstr "E686: Argumento de %s devas esti Listo"
|
||||
|
||||
msgid "E109: Missing ':' after '?'"
|
||||
msgstr "E109: Mankas ':' post '?'"
|
||||
|
||||
msgid "E690: Missing \"in\" after :for"
|
||||
msgstr "E690: \"in\" mankas post \":for\""
|
||||
|
||||
#, c-format
|
||||
msgid "E117: Unknown function: %s"
|
||||
msgstr "E117: Nekonata funkcio: %s"
|
||||
|
||||
msgid "E111: Missing ']'"
|
||||
msgstr "E111: Mankas ']'"
|
||||
|
||||
msgid "E581: :else without :if"
|
||||
msgstr "E581: \":else\" sen \":if\""
|
||||
|
||||
msgid "E582: :elseif without :if"
|
||||
msgstr "E582: \":elseif\" sen \":if\""
|
||||
|
||||
msgid "E580: :endif without :if"
|
||||
msgstr "E580: \":endif\" sen \":if\""
|
||||
|
||||
msgid "E586: :continue without :while or :for"
|
||||
msgstr "E586: \":continue\" sen \":while\" aŭ \":for\""
|
||||
|
||||
msgid "E587: :break without :while or :for"
|
||||
msgstr "E587: \":break\" sen \":while\" aŭ \":for\""
|
||||
|
||||
msgid "E274: No white space allowed before parenthesis"
|
||||
msgstr "E274: Neniu spaceto permesebla antaŭ ol komenca krampo"
|
||||
|
||||
msgid "search hit TOP, continuing at BOTTOM"
|
||||
msgstr "serĉo atingis SUPRON, daŭrigonte al SUBO"
|
||||
|
||||
msgid "search hit BOTTOM, continuing at TOP"
|
||||
msgstr "serĉo atingis SUBON, daŭrigonte al SUPRO"
|
||||
|
||||
msgid " line "
|
||||
msgstr " linio "
|
||||
|
||||
#, c-format
|
||||
msgid "Need encryption key for \"%s\""
|
||||
msgstr "Ŝlosilo de ĉifrado bezonata por \"%s\""
|
||||
|
||||
+2
-2
@@ -2617,14 +2617,14 @@ getreg_wrap_one_line(char_u *s, int flags)
|
||||
}
|
||||
|
||||
/*
|
||||
* Return the contents of a register as a single allocated string.
|
||||
* Return the contents of a register as a single allocated string or as a list.
|
||||
* Used for "@r" in expressions and for getreg().
|
||||
* Returns NULL for error.
|
||||
* Flags:
|
||||
* GREG_NO_EXPR Do not allow expression register
|
||||
* GREG_EXPR_SRC For the expression register: return expression itself,
|
||||
* not the result of its evaluation.
|
||||
* GREG_LIST Return a list of lines in place of a single string.
|
||||
* GREG_LIST Return a list of lines instead of a single string.
|
||||
*/
|
||||
char_u *
|
||||
get_reg_contents(int regname, int flags)
|
||||
|
||||
+9
-3
@@ -1279,9 +1279,15 @@ typedef long_u hash_T; // Type for hi_hash
|
||||
#else
|
||||
typedef long long varnumber_T;
|
||||
typedef unsigned long long uvarnumber_T;
|
||||
# define VARNUM_MIN LLONG_MIN
|
||||
# define VARNUM_MAX LLONG_MAX
|
||||
# define UVARNUM_MAX ULLONG_MAX
|
||||
# ifdef LLONG_MIN
|
||||
# define VARNUM_MIN LLONG_MIN
|
||||
# define VARNUM_MAX LLONG_MAX
|
||||
# define UVARNUM_MAX ULLONG_MAX
|
||||
# else
|
||||
# define VARNUM_MIN LONG_LONG_MIN
|
||||
# define VARNUM_MAX LONG_LONG_MAX
|
||||
# define UVARNUM_MAX ULONG_LONG_MAX
|
||||
# endif
|
||||
#endif
|
||||
|
||||
typedef double float_T;
|
||||
|
||||
@@ -566,6 +566,8 @@ term_start(
|
||||
}
|
||||
}
|
||||
}
|
||||
vim_free(curbuf->b_sfname);
|
||||
curbuf->b_sfname = vim_strsave(curbuf->b_ffname);
|
||||
curbuf->b_fname = curbuf->b_ffname;
|
||||
|
||||
if (opt->jo_term_opencmd != NULL)
|
||||
|
||||
@@ -51,6 +51,12 @@ func Test_complete_wildmenu()
|
||||
call feedkeys(":e Xdir1/\<Tab>\<Down>\<Up>\<Right>\<CR>", 'tx')
|
||||
call assert_equal('testfile1', getline(1))
|
||||
|
||||
" Completion using a relative path
|
||||
cd Xdir1/Xdir2
|
||||
call feedkeys(":e ../\<Tab>\<Right>\<Down>\<C-A>\<C-B>\"\<CR>", 'tx')
|
||||
call assert_equal('"e Xtestfile3 Xtestfile4', @:)
|
||||
cd -
|
||||
|
||||
" cleanup
|
||||
%bwipe
|
||||
call delete('Xdir1/Xdir2/Xtestfile4')
|
||||
@@ -456,6 +462,10 @@ func Test_cmdline_paste()
|
||||
" ignore error E32
|
||||
endtry
|
||||
call assert_equal("Xtestfile", bufname("%"))
|
||||
|
||||
" Use an invalid expression for <C-\>e
|
||||
call assert_beeps('call feedkeys(":\<C-\>einvalid\<CR>", "tx")')
|
||||
|
||||
bwipe!
|
||||
endfunc
|
||||
|
||||
@@ -690,6 +700,8 @@ func Test_getcmdtype()
|
||||
cnoremap <expr> <F6> Check_cmdline('=')
|
||||
call feedkeys("a\<C-R>=MyCmd a\<F6>\<Esc>\<Esc>", "xt")
|
||||
cunmap <F6>
|
||||
|
||||
call assert_equal('', getcmdline())
|
||||
endfunc
|
||||
|
||||
func Test_getcmdwintype()
|
||||
@@ -930,6 +942,22 @@ func Test_cmdwin_cedit()
|
||||
delfunc CmdWinType
|
||||
endfunc
|
||||
|
||||
" Test for CmdwinEnter autocmd
|
||||
func Test_cmdwin_autocmd()
|
||||
augroup CmdWin
|
||||
au!
|
||||
autocmd CmdwinEnter * startinsert
|
||||
augroup END
|
||||
|
||||
call assert_fails('call feedkeys("q:xyz\<CR>", "xt")', 'E492:')
|
||||
call assert_equal('xyz', @:)
|
||||
|
||||
augroup CmdWin
|
||||
au!
|
||||
augroup END
|
||||
augroup! CmdWin
|
||||
endfunc
|
||||
|
||||
func Test_cmdlineclear_tabenter()
|
||||
CheckScreendump
|
||||
|
||||
@@ -974,6 +1002,10 @@ func Test_cmdwin_jump_to_win()
|
||||
call assert_equal(1, winnr('$'))
|
||||
call feedkeys("q/:exit\<CR>", "xt")
|
||||
call assert_equal(1, winnr('$'))
|
||||
|
||||
" opening command window twice should fail
|
||||
call assert_beeps('call feedkeys("q:q:\<CR>\<CR>", "xt")')
|
||||
call assert_equal(1, winnr('$'))
|
||||
endfunc
|
||||
|
||||
" Test for backtick expression in the command line
|
||||
@@ -1013,4 +1045,19 @@ func Test_cmd_bang()
|
||||
call delete('Xresult')
|
||||
endfunc
|
||||
|
||||
" Test for using ~ for home directory in cmdline completion matches
|
||||
func Test_cmdline_expand_home()
|
||||
call mkdir('Xdir')
|
||||
call writefile([], 'Xdir/Xfile1')
|
||||
call writefile([], 'Xdir/Xfile2')
|
||||
cd Xdir
|
||||
let save_HOME = $HOME
|
||||
let $HOME = getcwd()
|
||||
call feedkeys(":e ~/\<C-A>\<C-B>\"\<CR>", 'xt')
|
||||
call assert_equal('"e ~/Xfile1 ~/Xfile2', @:)
|
||||
let $HOME = save_HOME
|
||||
cd ..
|
||||
call delete('Xdir', 'rf')
|
||||
endfunc
|
||||
|
||||
" vim: shiftwidth=2 sts=2 expandtab
|
||||
|
||||
@@ -1141,6 +1141,30 @@ func Test_col()
|
||||
bw!
|
||||
endfunc
|
||||
|
||||
" Test for input()
|
||||
func Test_input_func()
|
||||
" Test for prompt with multiple lines
|
||||
redir => v
|
||||
call feedkeys(":let c = input(\"A\\nB\\nC\\n? \")\<CR>B\<CR>", 'xt')
|
||||
redir END
|
||||
call assert_equal("B", c)
|
||||
call assert_equal(['A', 'B', 'C'], split(v, "\n"))
|
||||
|
||||
" Test for default value
|
||||
call feedkeys(":let c = input('color? ', 'red')\<CR>\<CR>", 'xt')
|
||||
call assert_equal('red', c)
|
||||
|
||||
" Test for completion at the input prompt
|
||||
func! Tcomplete(arglead, cmdline, pos)
|
||||
return "item1\nitem2\nitem3"
|
||||
endfunc
|
||||
call feedkeys(":let c = input('Q? ', '' , 'custom,Tcomplete')\<CR>"
|
||||
\ .. "\<C-A>\<CR>", 'xt')
|
||||
delfunc Tcomplete
|
||||
call assert_equal('item1 item2 item3', c)
|
||||
endfunc
|
||||
|
||||
" Test for inputlist()
|
||||
func Test_inputlist()
|
||||
call feedkeys(":let c = inputlist(['Select color:', '1. red', '2. green', '3. blue'])\<cr>1\<cr>", 'tx')
|
||||
call assert_equal(1, c)
|
||||
@@ -2034,3 +2058,5 @@ func Test_echoraw()
|
||||
call StopVimInTerminal(buf)
|
||||
call delete('XTest_echoraw')
|
||||
endfunc
|
||||
|
||||
" vim: shiftwidth=2 sts=2 expandtab
|
||||
|
||||
@@ -85,6 +85,8 @@ function Test_History()
|
||||
call assert_fails('call histget([])', 'E730:')
|
||||
call assert_equal(-1, histnr('abc'))
|
||||
call assert_fails('call histnr([])', 'E730:')
|
||||
call assert_fails('history xyz', 'E488:')
|
||||
call assert_fails('history ,abc', 'E488:')
|
||||
endfunction
|
||||
|
||||
function Test_Search_history_window()
|
||||
@@ -108,3 +110,52 @@ function Test_history_completion()
|
||||
call feedkeys(":history \<C-A>\<C-B>\"\<CR>", 'tx')
|
||||
call assert_equal('"history / : = > ? @ all cmd debug expr input search', @:)
|
||||
endfunc
|
||||
|
||||
" Test for increasing the 'history' option value
|
||||
func Test_history_size()
|
||||
let save_histsz = &history
|
||||
call histdel(':')
|
||||
set history=5
|
||||
for i in range(1, 5)
|
||||
call histadd(':', 'cmd' .. i)
|
||||
endfor
|
||||
call assert_equal(5, histnr(':'))
|
||||
call assert_equal('cmd5', histget(':', -1))
|
||||
|
||||
set history=10
|
||||
for i in range(6, 10)
|
||||
call histadd(':', 'cmd' .. i)
|
||||
endfor
|
||||
call assert_equal(10, histnr(':'))
|
||||
call assert_equal('cmd1', histget(':', 1))
|
||||
call assert_equal('cmd10', histget(':', -1))
|
||||
|
||||
set history=5
|
||||
call histadd(':', 'abc')
|
||||
call assert_equal('', histget(':', 6))
|
||||
call assert_equal('', histget(':', 12))
|
||||
call assert_equal('cmd7', histget(':', 7))
|
||||
call assert_equal('abc', histget(':', -1))
|
||||
|
||||
let &history=save_histsz
|
||||
endfunc
|
||||
|
||||
" Test for recalling old search patterns in /
|
||||
func Test_history_search()
|
||||
call histdel('/')
|
||||
let g:pat = []
|
||||
func SavePat()
|
||||
call add(g:pat, getcmdline())
|
||||
return ''
|
||||
endfunc
|
||||
cnoremap <F2> <C-\>eSavePat()<CR>
|
||||
call histadd('/', 'pat1')
|
||||
call histadd('/', 'pat2')
|
||||
let @/ = ''
|
||||
call feedkeys("/\<Up>\<F2>\<Up>\<F2>\<Down>\<Down>\<F2>\<Esc>", 'xt')
|
||||
call assert_equal(['pat2', 'pat1', ''], g:pat)
|
||||
cunmap <F2>
|
||||
delfunc SavePat
|
||||
endfunc
|
||||
|
||||
" vim: shiftwidth=2 sts=2 expandtab
|
||||
|
||||
@@ -92,3 +92,39 @@ func Test_menu_commands()
|
||||
|
||||
unlet g:did_menu
|
||||
endfun
|
||||
|
||||
" Test for menu item completion in command line
|
||||
func Test_menu_expand()
|
||||
" Create the menu itmes for test
|
||||
for i in range(1, 4)
|
||||
let m = 'menu Xmenu.A' .. i .. '.A' .. i
|
||||
for j in range(1, 4)
|
||||
exe m .. 'B' .. j .. ' :echo "A' .. i .. 'B' .. j .. '"' .. "<CR>"
|
||||
endfor
|
||||
endfor
|
||||
set wildmenu
|
||||
|
||||
" Test for <CR> selecting a submenu
|
||||
call feedkeys(":emenu Xmenu.A\<Tab>\<CR>\<Right>x\<BS>\<C-B>\"\<CR>", 'xt')
|
||||
call assert_equal('"emenu Xmenu.A1.A1B2', @:)
|
||||
|
||||
" Test for <Down> selecting a submenu
|
||||
call feedkeys(":emenu Xmenu.A\<Tab>\<Right>\<Right>\<Down>" ..
|
||||
\ "\<C-A>\<C-B>\"\<CR>", 'xt')
|
||||
call assert_equal('"emenu Xmenu.A3.A3B1 A3B2 A3B3 A3B4', @:)
|
||||
|
||||
" Test for <Up> to go up a submenu
|
||||
call feedkeys(":emenu Xmenu.A\<Tab>\<Down>\<Up>\<Right>\<Right>" ..
|
||||
\ "\<Left>\<Down>\<C-A>\<C-B>\"\<CR>", 'xt')
|
||||
call assert_equal('"emenu Xmenu.A2.A2B1 A2B2 A2B3 A2B4', @:)
|
||||
|
||||
" Test for <Up> to go up a menu
|
||||
call feedkeys(":emenu Xmenu.A\<Tab>\<Down>\<Up>\<Up>\<Up>" ..
|
||||
\ "\<C-A>\<C-B>\"\<CR>", 'xt')
|
||||
call assert_equal('"emenu Buffers. Xmenu.', @:)
|
||||
|
||||
set wildmenu&
|
||||
unmenu Xmenu
|
||||
endfunc
|
||||
|
||||
" vim: shiftwidth=2 sts=2 expandtab
|
||||
|
||||
@@ -2410,3 +2410,9 @@ func Test_issue_5607()
|
||||
bw!
|
||||
endtry
|
||||
endfunc
|
||||
|
||||
func Test_hidden_terminal()
|
||||
let buf = term_start(&shell, #{hidden: 1})
|
||||
call assert_equal('', bufname('^$'))
|
||||
call StopShellInTerminal(buf)
|
||||
endfunc
|
||||
|
||||
@@ -861,4 +861,8 @@ func Test_expr_fails()
|
||||
call CheckDefExecFailure("CallMe ('yes')", 'E492:')
|
||||
call CheckDefFailure("CallMe2('yes','no')", 'E1069:')
|
||||
call CheckDefFailure("CallMe2('yes' , 'no')", 'E1068:')
|
||||
|
||||
call CheckDefFailure("v:nosuch += 3", 'E1001:')
|
||||
call CheckDefFailure("let v:version = 3", 'E1064:')
|
||||
call CheckDefFailure("let asdf = v:nosuch", 'E1001:')
|
||||
endfunc
|
||||
|
||||
@@ -37,14 +37,20 @@ def Test_assignment()
|
||||
let bool2: bool = false
|
||||
assert_equal(v:false, bool2)
|
||||
|
||||
let list1: list<string> = ['sdf', 'asdf']
|
||||
let list1: list<bool> = [false, true, false]
|
||||
let list2: list<number> = [1, 2, 3]
|
||||
let list3: list<string> = ['sdf', 'asdf']
|
||||
let list4: list<any> = ['yes', true, 1234]
|
||||
let list5: list<blob> = [0z01, 0z02]
|
||||
|
||||
let listS: list<string> = []
|
||||
let listN: list<number> = []
|
||||
|
||||
let dict1: dict<string> = #{key: 'value'}
|
||||
let dict1: dict<bool> = #{one: false, two: true}
|
||||
let dict2: dict<number> = #{one: 1, two: 2}
|
||||
let dict3: dict<string> = #{key: 'value'}
|
||||
let dict4: dict<any> = #{one: 1, two: '2'}
|
||||
let dict5: dict<blob> = #{one: 0z01, tw: 0z02}
|
||||
|
||||
g:newvar = 'new'
|
||||
assert_equal('new', g:newvar)
|
||||
|
||||
@@ -753,6 +753,18 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
319,
|
||||
/**/
|
||||
318,
|
||||
/**/
|
||||
317,
|
||||
/**/
|
||||
316,
|
||||
/**/
|
||||
315,
|
||||
/**/
|
||||
314,
|
||||
/**/
|
||||
313,
|
||||
/**/
|
||||
|
||||
@@ -213,6 +213,8 @@ get_list_type(type_T *member_type, garray_T *type_list)
|
||||
return &t_list_any;
|
||||
if (member_type->tt_type == VAR_VOID)
|
||||
return &t_list_empty;
|
||||
if (member_type->tt_type == VAR_BOOL)
|
||||
return &t_list_bool;
|
||||
if (member_type->tt_type == VAR_NUMBER)
|
||||
return &t_list_number;
|
||||
if (member_type->tt_type == VAR_STRING)
|
||||
@@ -238,6 +240,8 @@ get_dict_type(type_T *member_type, garray_T *type_list)
|
||||
return &t_dict_any;
|
||||
if (member_type->tt_type == VAR_VOID)
|
||||
return &t_dict_empty;
|
||||
if (member_type->tt_type == VAR_BOOL)
|
||||
return &t_dict_bool;
|
||||
if (member_type->tt_type == VAR_NUMBER)
|
||||
return &t_dict_number;
|
||||
if (member_type->tt_type == VAR_STRING)
|
||||
|
||||
Reference in New Issue
Block a user