updated for version 7.0080
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index f86bb1b..1b3db04 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -4247,7 +4247,6 @@
gettext Compiled with message translation |multi-lang|
gui Compiled with GUI enabled.
gui_athena Compiled with Athena GUI.
-gui_beos Compiled with BeOS GUI.
gui_gtk Compiled with GTK+ GUI (any version).
gui_gtk2 Compiled with GTK+ 2 GUI (gui_gtk is also defined).
gui_kde Compiled with KDE GUI |KVim|
diff --git a/runtime/doc/tags b/runtime/doc/tags
index 81311a5..a835764 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -1005,7 +1005,6 @@
++opt editing.txt /*++opt*
+ARP various.txt /*+ARP*
+GUI_Athena various.txt /*+GUI_Athena*
-+GUI_BeOS various.txt /*+GUI_BeOS*
+GUI_GTK various.txt /*+GUI_GTK*
+GUI_Motif various.txt /*+GUI_Motif*
+GUI_Photon various.txt /*+GUI_Photon*
@@ -4224,6 +4223,7 @@
blockwise-operators visual.txt /*blockwise-operators*
blockwise-register change.txt /*blockwise-register*
blockwise-visual visual.txt /*blockwise-visual*
+bold syntax.txt /*bold*
book intro.txt /*book*
bookmark usr_03.txt /*bookmark*
boolean options.txt /*boolean*
@@ -5121,7 +5121,6 @@
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*
@@ -5391,11 +5390,13 @@
internet intro.txt /*internet*
intro intro.txt /*intro*
intro.txt intro.txt /*intro.txt*
+inverse syntax.txt /*inverse*
ip motion.txt /*ip*
iquote motion.txt /*iquote*
is motion.txt /*is*
isdirectory() eval.txt /*isdirectory()*
islocked() eval.txt /*islocked()*
+italic syntax.txt /*italic*
items() eval.txt /*items()*
iw motion.txt /*iw*
i{ motion.txt /*i{*
@@ -6268,6 +6269,7 @@
sscanf eval.txt /*sscanf*
standard-plugin usr_05.txt /*standard-plugin*
standard-plugin-list help.txt /*standard-plugin-list*
+standout syntax.txt /*standout*
star pattern.txt /*star*
start-of-file pattern.txt /*start-of-file*
starting starting.txt /*starting*
@@ -6618,6 +6620,8 @@
u undo.txt /*u*
uganda uganda.txt /*uganda*
uganda.txt uganda.txt /*uganda.txt*
+undercurl syntax.txt /*undercurl*
+underline syntax.txt /*underline*
undo undo.txt /*undo*
undo-commands undo.txt /*undo-commands*
undo-redo undo.txt /*undo-redo*
diff --git a/runtime/spell/en.ascii.spl b/runtime/spell/en.ascii.spl
index 5b111cf..d1a42e0 100644
--- a/runtime/spell/en.ascii.spl
+++ b/runtime/spell/en.ascii.spl
Binary files differ
diff --git a/runtime/spell/en.latin1.spl b/runtime/spell/en.latin1.spl
index d108695..36f9b67 100644
--- a/runtime/spell/en.latin1.spl
+++ b/runtime/spell/en.latin1.spl
Binary files differ
diff --git a/runtime/tutor/tutor.sv b/runtime/tutor/tutor.sv
index 2ff3eb8..62e3db0 100644
--- a/runtime/tutor/tutor.sv
+++ b/runtime/tutor/tutor.sv
@@ -825,6 +825,6 @@
Colorado State University. E-post: bware@mines.colorado.edu.
Modifierad för Vim av Bram Moolenaar.
- Översatt av Johan Svedberg <johan@svedberg.pp.se>
+ Översatt av Johan Svedberg <johan@svedberg.com>
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/src/feature.h b/src/feature.h
index 0dac4ab..8733199 100644
--- a/src/feature.h
+++ b/src/feature.h
@@ -1111,8 +1111,7 @@
/*
* +GUI_Athena To compile Vim with or without the GUI (gvim) you have
- * +GUI_BeOS to edit the Makefile.
- * +GUI_Motif
+ * +GUI_Motif to edit the Makefile.
*/
/*
diff --git a/src/mbyte.c b/src/mbyte.c
index 71a03a5..996eb8d 100644
--- a/src/mbyte.c
+++ b/src/mbyte.c
@@ -2186,12 +2186,13 @@
* two characters otherwise.
*/
int
-mb_strnicmp(s1, s2, n)
+mb_strnicmp(s1, s2, nn)
char_u *s1, *s2;
- int n;
+ size_t nn;
{
int i, j, l;
int cdiff;
+ int n = nn;
for (i = 0; i < n; i += l)
{
diff --git a/src/proto/mbyte.pro b/src/proto/mbyte.pro
index 11b6443..6e85df0 100644
--- a/src/proto/mbyte.pro
+++ b/src/proto/mbyte.pro
@@ -39,7 +39,7 @@
int utf_islower __ARGS((int a));
int utf_tolower __ARGS((int a));
int utf_isupper __ARGS((int a));
-int mb_strnicmp __ARGS((char_u *s1, char_u *s2, int n));
+int mb_strnicmp __ARGS((char_u *s1, char_u *s2, size_t nn));
void show_utf8 __ARGS((void));
int latin_head_off __ARGS((char_u *base, char_u *p));
int dbcs_head_off __ARGS((char_u *base, char_u *p));
diff --git a/src/screen.c b/src/screen.c
index 8c6dba1..ece886b 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -3580,7 +3580,7 @@
if (area_attr == 0 && search_attr == 0)
char_attr = syntax_attr;
else
- char_attr = hl_combine_attr(char_attr, syntax_attr);
+ char_attr = hl_combine_attr(syntax_attr, char_attr);
}
/* Check spelling (unless at the end of the line).
diff --git a/src/testdir/test49.vim b/src/testdir/test49.vim
index 1b336de..93ae4b2 100644
--- a/src/testdir/test49.vim
+++ b/src/testdir/test49.vim
@@ -147,7 +147,7 @@
" The Xpath/Xloop commands can be used for computing the eXecution path by
" adding (different) powers of 2 from those script lines, for which the
" execution should be checked. Xloop provides different addends for each
-" execution of a loop. Permittable values are 2^0 to 2^30, so that 31 execution
+" execution of a loop. Permitted values are 2^0 to 2^30, so that 31 execution
" points (multiply counted inside loops) can be tested.
"
" Note that the arguments of the following commands can be generated
@@ -257,18 +257,17 @@
\ let Xtest = Xtest + 1
if exists("g:ExtraVimResult")
- com! -nargs=+ Xout exec "exec \"!echo @R:'\" ."
- \ 'substitute(substitute("' . <args> .
- \ '", "' . "'" . '", ' . "'" . '&\\&&' . "'"
- \ . ', "g"), "\n", "@NL@", "g")'
- \ ". \"' >>\" . g:ExtraVimResult"
+ com! -nargs=+ Xoutq exec "!echo @R:'" .
+ \ substitute(substitute(<q-args>,
+ \ "'", '&\\&&', "g"), "\n", "@NL@", "g")
+ \ . "' >>" . g:ExtraVimResult
else
- com! -nargs=+ Xout exec 'let @R = "--- Test ' .
+ com! -nargs=+ Xoutq let @R = "--- Test " .
\ (g:Xtest<10?" ":g:Xtest<100?" ":"") .
- \ g:Xtest . ": " .
- \ '" . substitute("' . <args> .
- \ '", "\n", "&\t ", "g") . "\n"'
+ \ g:Xtest . ": " . substitute(<q-args>,
+ \ "\n", "&\t ", "g") . "\n"
endif
+com! -nargs=+ Xout exec 'Xoutq' <args>
" Switch off storing of lines for undoing changes. Speeds things up a little.
set undolevels=-1
@@ -458,7 +457,7 @@
" resultfile in ExtraVimResult. Redirect messages to the file specified as
" argument if any. Use ":debuggreedy" so that the commands provided on the
" pipe are consumed at the debug prompt. Use "-N" to enable command-line
- " contiunation ("C" in 'cpo'). Add "nviminfo" to 'viminfo' to avoid
+ " continuation ("C" in 'cpo'). Add "nviminfo" to 'viminfo' to avoid
" messing up the user's viminfo file.
let redirect = a:0 ?
\ " -c 'au VimLeave * redir END' -c 'redir\\! >" . a:1 . "'" : ""
@@ -502,7 +501,7 @@
" ExtraVimThrowpoint() - Relative throwpoint in ExtraVim script {{{2
"
-" Evaluates v:throwpoint and returns the throwpoint relativ to the beginning of
+" Evaluates v:throwpoint and returns the throwpoint relative to the beginning of
" an ExtraVim script as passed by ExtraVim() in ExtraVimBegin.
"
" EXTRA_VIM_START - do not change or remove this line.
@@ -4142,7 +4141,7 @@
"-------------------------------------------------------------------------------
-" Test 49: Throwing exceptions accross functions {{{1
+" Test 49: Throwing exceptions across functions {{{1
"
" When an exception is thrown but not caught inside a function, the
" caller is checked for a matching :catch clause.
@@ -4224,7 +4223,7 @@
"-------------------------------------------------------------------------------
-" Test 50: Throwing exceptions accross script files {{{1
+" Test 50: Throwing exceptions across script files {{{1
"
" When an exception is thrown but not caught inside a script file,
" the sourcing script or function is checked for a matching :catch
@@ -4293,7 +4292,7 @@
"-------------------------------------------------------------------------------
-" Test 51: Throwing exceptions accross :execute and user commands {{{1
+" Test 51: Throwing exceptions across :execute and user commands {{{1
"
" A :throw command may be executed under an ":execute" or from
" a user command.
@@ -5435,7 +5434,7 @@
let line = a:0 != 0 ? a:3 : 0 " fourth parameter (optional)
let error = 0
if emsg != ""
- " exception is the error number, emsg the english error message text
+ " exception is the error number, emsg the English error message text
if exception !~ '^E\d\+$'
Xout "TODO: Add message number for:" emsg
elseif v:lang == "C" || v:lang =~ '^[Ee]n'
@@ -6306,7 +6305,7 @@
Xpath 4194304 " X: 0
endif
silent! call S(5) " X: 3 * 256
- " Break out of try conds that cover ":silent!". This also
+ " Break out of try conditionals that cover ":silent!". This also
" discards the aborting error when $VIMNOERRTHROW is non-zero.
break
endtry
@@ -6720,7 +6719,7 @@
"-------------------------------------------------------------------------------
-" Test 67: :throw accross :call command {{{1
+" Test 67: :throw across :call command {{{1
"
" On a call command, an exception might be thrown when evaluating the
" function name, during evaluation of the arguments, or when the
@@ -6732,104 +6731,170 @@
function! THROW(x, n)
if a:n == 1
- Xpath 1 " X: 1
+ Xpath 1 " X: 1
elseif a:n == 2
- Xpath 2 " X: 2
+ Xpath 2 " X: 2
elseif a:n == 3
- Xpath 4 " X: 4
+ Xpath 4 " X: 4
endif
throw a:x
endfunction
function! NAME(x, n)
if a:n == 1
- Xpath 8 " X: 0
+ Xpath 8 " X: 0
elseif a:n == 2
- Xpath 16 " X: 16
+ Xpath 16 " X: 16
elseif a:n == 3
- Xpath 32 " X: 32
+ Xpath 32 " X: 32
elseif a:n == 4
- Xpath 64 " X: 64
+ Xpath 64 " X: 64
endif
return a:x
endfunction
function! ARG(x, n)
if a:n == 1
- Xpath 128 " X: 0
+ Xpath 128 " X: 0
elseif a:n == 2
- Xpath 256 " X: 0
+ Xpath 256 " X: 0
elseif a:n == 3
- Xpath 512 " X: 512
+ Xpath 512 " X: 512
elseif a:n == 4
- Xpath 1024 " X: 1024
+ Xpath 1024 " X: 1024
endif
return a:x
endfunction
function! F(x, n)
if a:n == 2
- Xpath 2048 " X: 0
+ Xpath 2048 " X: 0
elseif a:n == 4
- Xpath 4096 " X: 4096
+ Xpath 4096 " X: 4096
endif
endfunction
-try
-
+while 1
try
- Xpath 8192 " X: 8192
- call {NAME(THROW("name", 1), 1)}(ARG(4711, 1), 1)
- Xpath 16384 " X: 0
- catch /^name$/
- Xpath 32768 " X: 32768
- catch /.*/
- Xpath 65536 " X: 0
- Xout "1:" v:exception "in" v:throwpoint
- endtry
+ let error = 0
+ let v:errmsg = ""
- try
- Xpath 131072 " X: 131072
- call {NAME("F", 2)}(ARG(THROW("arg", 2), 2), 2)
- Xpath 262144 " X: 0
- catch /^arg$/
- Xpath 524288 " X: 524288
- catch /.*/
- Xpath 1048576 " X: 0
- Xout "2:" v:exception "in" v:throwpoint
- endtry
+ while 1
+ try
+ Xpath 8192 " X: 8192
+ call {NAME(THROW("name", 1), 1)}(ARG(4711, 1), 1)
+ Xpath 16384 " X: 0
+ catch /^name$/
+ Xpath 32768 " X: 32768
+ catch /.*/
+ let error = 1
+ Xout "1:" v:exception "in" v:throwpoint
+ finally
+ if !error && $VIMNOERRTHROW && v:errmsg != ""
+ let error = 1
+ Xout "1:" v:errmsg
+ endif
+ if error
+ Xpath 65536 " X: 0
+ endif
+ let error = 0
+ let v:errmsg = ""
+ break " discard error for $VIMNOERRTHROW
+ endtry
+ endwhile
- try
- Xpath 2097152 " X: 2097152
- call {NAME("THROW", 3)}(ARG("call", 3), 3)
- Xpath 4194304 " X: 0
- catch /^call$/
- Xpath 8388608 " X: 8388608
+ while 1
+ try
+ Xpath 131072 " X: 131072
+ call {NAME("F", 2)}(ARG(THROW("arg", 2), 2), 2)
+ Xpath 262144 " X: 0
+ catch /^arg$/
+ Xpath 524288 " X: 524288
+ catch /.*/
+ let error = 1
+ Xout "2:" v:exception "in" v:throwpoint
+ finally
+ if !error && $VIMNOERRTHROW && v:errmsg != ""
+ let error = 1
+ Xout "2:" v:errmsg
+ endif
+ if error
+ Xpath 1048576 " X: 0
+ endif
+ let error = 0
+ let v:errmsg = ""
+ break " discard error for $VIMNOERRTHROW
+ endtry
+ endwhile
+
+ while 1
+ try
+ Xpath 2097152 " X: 2097152
+ call {NAME("THROW", 3)}(ARG("call", 3), 3)
+ Xpath 4194304 " X: 0
+ catch /^call$/
+ Xpath 8388608 " X: 8388608
+ catch /^0$/ " default return value
+ Xpath 16777216 " X: 0
+ Xout "3:" v:throwpoint
+ catch /.*/
+ let error = 1
+ Xout "3:" v:exception "in" v:throwpoint
+ finally
+ if !error && $VIMNOERRTHROW && v:errmsg != ""
+ let error = 1
+ Xout "3:" v:errmsg
+ endif
+ if error
+ Xpath 33554432 " X: 0
+ endif
+ let error = 0
+ let v:errmsg = ""
+ break " discard error for $VIMNOERRTHROW
+ endtry
+ endwhile
+
+ while 1
+ try
+ Xpath 67108864 " X: 67108864
+ call {NAME("F", 4)}(ARG(4711, 4), 4)
+ Xpath 134217728 " X: 134217728
+ catch /.*/
+ let error = 1
+ Xout "4:" v:exception "in" v:throwpoint
+ finally
+ if !error && $VIMNOERRTHROW && v:errmsg != ""
+ let error = 1
+ Xout "4:" v:errmsg
+ endif
+ if error
+ Xpath 268435456 " X: 0
+ endif
+ let error = 0
+ let v:errmsg = ""
+ break " discard error for $VIMNOERRTHROW
+ endtry
+ endwhile
+
catch /^0$/ " default return value
- Xpath 16777216 " X: 0
- Xout "3:" v:throwpoint
+ Xpath 536870912 " X: 0
+ Xout v:throwpoint
catch /.*/
- Xpath 33554432 " X: 0
- Xout "3:" v:exception "in" v:throwpoint
+ let error = 1
+ Xout v:exception "in" v:throwpoint
+ finally
+ if !error && $VIMNOERRTHROW && v:errmsg != ""
+ let error = 1
+ Xout v:errmsg
+ endif
+ if error
+ Xpath 1073741824 " X: 0
+ endif
+ break " discard error for $VIMNOERRTHROW
endtry
+endwhile
- try
- Xpath 67108864 " X: 67108864
- call {NAME("F", 4)}(ARG(4711, 4), 4)
- Xpath 134217728 " X: 134217728
- catch /.*/
- Xpath 268435456 " X: 0
- Xout "4:" v:exception "in" v:throwpoint
- endtry
-
-catch /^0$/ " default return value
- Xpath 536870912 " X: 0
- Xout v:throwpoint
-catch /.*/
- Xpath 1073741824 " X: 0
- Xout v:exception "in" v:throwpoint
-endtry
-
+unlet error
delfunction F
Xcheck 212514423
@@ -6838,7 +6903,7 @@
"-------------------------------------------------------------------------------
-" Test 68: :throw accross function calls in expressions {{{1
+" Test 68: :throw across function calls in expressions {{{1
"
" On a function call within an expression, an exception might be
" thrown when evaluating the function name, during evaluation of the
@@ -6853,74 +6918,139 @@
function! F(x, n)
if a:n == 2
- Xpath 2048 " X: 0
+ Xpath 2048 " X: 0
elseif a:n == 4
- Xpath 4096 " X: 4096
+ Xpath 4096 " X: 4096
endif
return a:x
endfunction
unlet! var1 var2 var3 var4
-try
-
+while 1
try
- Xpath 8192 " X: 8192
- let var1 = {NAME(THROW("name", 1), 1)}(ARG(4711, 1), 1)
- Xpath 16384 " X: 0
- catch /^name$/
- Xpath 32768 " X: 32768
- catch /.*/
- Xpath 65536 " X: 0
- Xout "1:" v:exception "in" v:throwpoint
- endtry
+ let error = 0
+ let v:errmsg = ""
- try
- Xpath 131072 " X: 131072
- let var2 = {NAME("F", 2)}(ARG(THROW("arg", 2), 2), 2)
- Xpath 262144 " X: 0
- catch /^arg$/
- Xpath 524288 " X: 524288
- catch /.*/
- Xpath 1048576 " X: 0
- Xout "2:" v:exception "in" v:throwpoint
- endtry
+ while 1
+ try
+ Xpath 8192 " X: 8192
+ let var1 = {NAME(THROW("name", 1), 1)}(ARG(4711, 1), 1)
+ Xpath 16384 " X: 0
+ catch /^name$/
+ Xpath 32768 " X: 32768
+ catch /.*/
+ let error = 1
+ Xout "1:" v:exception "in" v:throwpoint
+ finally
+ if !error && $VIMNOERRTHROW && v:errmsg != ""
+ let error = 1
+ Xout "1:" v:errmsg
+ endif
+ if error
+ Xpath 65536 " X: 0
+ endif
+ let error = 0
+ let v:errmsg = ""
+ break " discard error for $VIMNOERRTHROW
+ endtry
+ endwhile
- try
- Xpath 2097152 " X: 2097152
- let var3 = {NAME("THROW", 3)}(ARG("call", 3), 3)
- Xpath 4194304 " X: 0
- catch /^call$/
- Xpath 8388608 " X: 8388608
+ while 1
+ try
+ Xpath 131072 " X: 131072
+ let var2 = {NAME("F", 2)}(ARG(THROW("arg", 2), 2), 2)
+ Xpath 262144 " X: 0
+ catch /^arg$/
+ Xpath 524288 " X: 524288
+ catch /.*/
+ let error = 1
+ Xout "2:" v:exception "in" v:throwpoint
+ finally
+ if !error && $VIMNOERRTHROW && v:errmsg != ""
+ let error = 1
+ Xout "2:" v:errmsg
+ endif
+ if error
+ Xpath 1048576 " X: 0
+ endif
+ let error = 0
+ let v:errmsg = ""
+ break " discard error for $VIMNOERRTHROW
+ endtry
+ endwhile
+
+ while 1
+ try
+ Xpath 2097152 " X: 2097152
+ let var3 = {NAME("THROW", 3)}(ARG("call", 3), 3)
+ Xpath 4194304 " X: 0
+ catch /^call$/
+ Xpath 8388608 " X: 8388608
+ catch /^0$/ " default return value
+ Xpath 16777216 " X: 0
+ Xout "3:" v:throwpoint
+ catch /.*/
+ let error = 1
+ Xout "3:" v:exception "in" v:throwpoint
+ finally
+ if !error && $VIMNOERRTHROW && v:errmsg != ""
+ let error = 1
+ Xout "3:" v:errmsg
+ endif
+ if error
+ Xpath 33554432 " X: 0
+ endif
+ let error = 0
+ let v:errmsg = ""
+ break " discard error for $VIMNOERRTHROW
+ endtry
+ endwhile
+
+ while 1
+ try
+ Xpath 67108864 " X: 67108864
+ let var4 = {NAME("F", 4)}(ARG(4711, 4), 4)
+ Xpath 134217728 " X: 134217728
+ catch /.*/
+ let error = 1
+ Xout "4:" v:exception "in" v:throwpoint
+ finally
+ if !error && $VIMNOERRTHROW && v:errmsg != ""
+ let error = 1
+ Xout "4:" v:errmsg
+ endif
+ if error
+ Xpath 268435456 " X: 0
+ endif
+ let error = 0
+ let v:errmsg = ""
+ break " discard error for $VIMNOERRTHROW
+ endtry
+ endwhile
+
catch /^0$/ " default return value
- Xpath 16777216 " X: 0
- Xout "3:" v:throwpoint
+ Xpath 536870912 " X: 0
+ Xout v:throwpoint
catch /.*/
- Xpath 33554432 " X: 0
- Xout "3:" v:exception "in" v:throwpoint
+ let error = 1
+ Xout v:exception "in" v:throwpoint
+ finally
+ if !error && $VIMNOERRTHROW && v:errmsg != ""
+ let error = 1
+ Xout v:errmsg
+ endif
+ if error
+ Xpath 1073741824 " X: 0
+ endif
+ break " discard error for $VIMNOERRTHROW
endtry
-
- try
- Xpath 67108864 " X: 67108864
- let var4 = {NAME("F", 4)}(ARG(4711, 4), 4)
- Xpath 134217728 " X: 134217728
- catch /.*/
- Xpath 268435456 " X: 0
- Xout "4:" v:exception "in" v:throwpoint
- endtry
-
-catch /^0$/ " default return value
- Xpath 536870912 " X: 0
- Xout v:throwpoint
-catch /.*/
- Xpath 1073741824 " X: 0
- Xout v:exception "in" v:throwpoint
-endtry
+endwhile
if exists("var1") || exists("var2") || exists("var3") ||
\ !exists("var4") || var4 != 4711
" The Xpath command does not accept 2^31 (negative); add explicitly:
- let Xpath = Xpath + 2147483648 " X: 0
+ let Xpath = Xpath + 2147483648 " X: 0
if exists("var1")
Xout "var1 =" var1
endif
@@ -6937,7 +7067,7 @@
endif
endif
-unlet! var1 var2 var3 var4
+unlet! error var1 var2 var3 var4
delfunction THROW
delfunction NAME
delfunction ARG
@@ -6947,7 +7077,7 @@
"-------------------------------------------------------------------------------
-" Test 69: :throw accross :if, :elseif, :while {{{1
+" Test 69: :throw across :if, :elseif, :while {{{1
"
" On an :if, :elseif, or :while command, an exception might be thrown
" during evaluation of the expression to test. The exception can be
@@ -7028,7 +7158,7 @@
"-------------------------------------------------------------------------------
-" Test 70: :throw accross :return or :throw {{{1
+" Test 70: :throw across :return or :throw {{{1
"
" On a :return or :throw command, an exception might be thrown during
" evaluation of the expression to return or throw, respectively. The
@@ -7146,7 +7276,7 @@
"-------------------------------------------------------------------------------
-" Test 71: :throw accross :echo variants and :execute {{{1
+" Test 71: :throw across :echo variants and :execute {{{1
"
" On an :echo, :echon, :echomsg, :echoerr, or :execute command, an
" exception might be thrown during evaluation of the arguments to
@@ -7253,7 +7383,7 @@
"-------------------------------------------------------------------------------
-" Test 72: :throw accross :let or :unlet {{{1
+" Test 72: :throw across :let or :unlet {{{1
"
" On a :let command, an exception might be thrown during evaluation
" of the expression to assign. On an :let or :unlet command, the
@@ -7412,7 +7542,7 @@
"-------------------------------------------------------------------------------
-" Test 73: :throw accross :function, :delfunction {{{1
+" Test 73: :throw across :function, :delfunction {{{1
"
" The :function and :delfunction commands may cause an expression
" specified in braces to be evaluated. During evaluation, an
@@ -7516,7 +7646,7 @@
"-------------------------------------------------------------------------------
-" Test 74: :throw accross builtin functions and commands {{{1
+" Test 74: :throw across builtin functions and commands {{{1
"
" Some functions like exists(), searchpair() take expression
" arguments, other functions or commands like substitute() or
@@ -7896,7 +8026,7 @@
"-------------------------------------------------------------------------------
-" Test 76: Errors, interupts, :throw during expression evaluation {{{1
+" Test 76: Errors, interrupts, :throw during expression evaluation {{{1
"
" When a function call made during expression evaluation is aborted
" due to an error inside a :try/:endtry region or due to an interrupt
@@ -8155,7 +8285,7 @@
"-------------------------------------------------------------------------------
-" Test 77: Errors, interupts, :throw in name{brace-expression} {{{1
+" Test 77: Errors, interrupts, :throw in name{brace-expression} {{{1
"
" When a function call made during evaluation of an expression in
" braces as part of a function name after ":function" is aborted due
@@ -8371,15 +8501,11 @@
\ '^Vim\((\a\+)\)\=:', '', "")
let caught = 1
finally
- if !caught " no error exceptions ($VIMNOERRTHROW set)
- if t <= 8 && t != 3
- call MSG(t, 'E475', 'Invalid argument\>')
- else
- call MSG(t, 'E15', "Invalid expression")
- endif
+ if t <= 8 && t != 3 && t != 7
+ call MSG(t, 'E475', 'Invalid argument\>')
else
- if t <= 2 || t == 4 || t == 5 || t == 6 || t == 8
- call MSG(t, 'E475', 'Invalid argument\>')
+ if !caught " no error exceptions ($VIMNOERRTHROW set)
+ call MSG(t, 'E15', "Invalid expression")
else
call MSG(t, 'E121', "Undefined variable")
endif
@@ -9058,7 +9184,7 @@
" exception is propagated to the caller.
"
" For the FuncUndefined event under a function call expression or
-" :call command, the function is not exexecuted, even when it has
+" :call command, the function is not executed, even when it has
" been defined by the autocommands before the exception occurred.
"-------------------------------------------------------------------------------
diff --git a/src/version.h b/src/version.h
index 3fa4e3d..7d49d7f 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 (2005 Jun 4)"
-#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2005 Jun 4, compiled "
+#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2005 Jun 5)"
+#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2005 Jun 5, compiled "