summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2005-01-17 22:16:15 +0000
committerBram Moolenaar <Bram@vim.org>2005-01-17 22:16:15 +0000
commit3a3a72348d1de85043b1be4dee14c11a24d26add (patch)
tree49b228aa3ba957c2a8cafcb77480c66927985937 /src
parentf3bae6935a55ddef3a7a7636596f454ddfd821cf (diff)
updated for version 7.0041
Diffstat (limited to 'src')
-rw-r--r--src/ex_eval.c11
-rw-r--r--src/version.h4
2 files changed, 10 insertions, 5 deletions
diff --git a/src/ex_eval.c b/src/ex_eval.c
index 38517e3e7f..6acf9de7df 100644
--- a/src/ex_eval.c
+++ b/src/ex_eval.c
@@ -1172,11 +1172,16 @@ ex_endwhile(eap)
fl = cstack->cs_flags[cstack->cs_idx];
if (!(fl & csf))
{
+ /* If we are in a ":while" or ":for" but used the wrong endloop
+ * command, do not rewind to the next enclosing ":for"/":while". */
if (fl & CSF_WHILE)
- eap->errmsg = (char_u *)_("E999: Using :endfor with :while");
+ eap->errmsg = (char_u *)_("E732: Using :endfor with :while");
else if (fl & CSF_FOR)
- eap->errmsg = (char_u *)_("E999: Using :endwhile with :for");
- else if (!(fl & CSF_TRY))
+ eap->errmsg = (char_u *)_("E733: Using :endwhile with :for");
+ }
+ if (!(fl & (CSF_WHILE | CSF_FOR)))
+ {
+ if (!(fl & CSF_TRY))
eap->errmsg = e_endif;
else if (fl & CSF_FINALLY)
eap->errmsg = e_endtry;
diff --git a/src/version.h b/src/version.h
index fbf243c831..84e377cb8e 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 (2004 Jan 16)"
-#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2004 Jan 16, compiled "
+#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2004 Jan 17)"
+#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2004 Jan 17, compiled "