summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2005-12-17 22:06:52 +0000
committerBram Moolenaar <Bram@vim.org>2005-12-17 22:06:52 +0000
commitacf534595b76b8992b3b4cfbae3158f850a3f2a5 (patch)
tree468bf1917f02d96ead59a495e7ec5df9a2f7e092
parent97d29a1ace00a173b7aa30ee1a4ae71a7e91bed3 (diff)
downloadvim-git-acf534595b76b8992b3b4cfbae3158f850a3f2a5.tar.gz
updated for version 7.0172
-rw-r--r--runtime/doc/debug.txt9
-rw-r--r--src/ex_getln.c19
-rw-r--r--src/version.h4
3 files changed, 17 insertions, 15 deletions
diff --git a/runtime/doc/debug.txt b/runtime/doc/debug.txt
index a0fef1b64..17bbe52f4 100644
--- a/runtime/doc/debug.txt
+++ b/runtime/doc/debug.txt
@@ -1,4 +1,4 @@
-*debug.txt* For Vim version 7.0aa. Last change: 2005 Sep 01
+*debug.txt* For Vim version 7.0aa. Last change: 2005 Dec 17
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -7,6 +7,7 @@
Debugging Vim *debug-vim*
This is for debugging Vim itself, when it doesn't work properly.
+For debugging Vim scripts, functions, etc. see |debug-scripts|
1. Location of a crash, using gcc and gdb |debug-gcc|
2. Windows Bug Reporting |debug-win32|
@@ -61,9 +62,9 @@ This includes the WinDbg debugger.
If you have Visual Studio, use that instead of the VC Toolkit
and WinDbg.
-
-(No idea what to do if your binary was built with the Borland or Cygwin
-compilers. Sorry.)
+For other compilers, you should always use the corresponding debugger: TD for
+a Vim executable compiled with the Borland compiler; gdb (see above
+|debug-gcc|) for the Cygwin and MinGW compilers.
=========================================================================
vim:tw=78:ts=8:ft=help:norl:
diff --git a/src/ex_getln.c b/src/ex_getln.c
index a55b49743..bc5aca560 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -1098,21 +1098,22 @@ getcmdline(firstc, count, indent)
save_cmdline(&save_ccline);
c = get_expr_register();
restore_cmdline(&save_ccline);
-
- /* When there was a serious error abort getting the
- * command line. */
- if (aborting())
- {
- gotesc = TRUE; /* will free ccline.cmdbuff after
- putting it in history */
- goto returncmd; /* back to cmd mode */
- }
}
}
#endif
if (c != ESC) /* use ESC to cancel inserting register */
{
cmdline_paste(c, i == Ctrl_R);
+
+ /* When there was a serious error abort getting the
+ * command line. */
+ if (aborting())
+ {
+ gotesc = TRUE; /* will free ccline.cmdbuff after
+ putting it in history */
+ goto returncmd; /* back to cmd mode */
+ }
+
KeyTyped = FALSE; /* Don't do p_wc completion. */
#ifdef FEAT_EVAL
if (new_cmdpos >= 0)
diff --git a/src/version.h b/src/version.h
index a1aed6e68..c500302e6 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 Dec 16)"
-#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2005 Dec 16, compiled "
+#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2005 Dec 17)"
+#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2005 Dec 17, compiled "