updated for version 7.0172

diff --git a/runtime/doc/debug.txt b/runtime/doc/debug.txt
index a0fef1b6460483e0c374925ca0529efc353eb505..17bbe52f412f11dae026865126286c6a4fa06f43 100644 (file)
--- 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 a55b49743867877444fd81db8aa9510d3bc568db..bc5aca560a1564058a0e7d2972de2d86c3ec6995 100644 (file)
--- 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 a1aed6e6885cec120e5e39ce792931572635c8d8..c500302e652cca2bc4f4d80c227209ed667fd22b 100644 (file)
--- 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 "