diff --git a/src/ex_getln.c b/src/ex_getln.c
index a55b497..bc5aca5 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -1098,21 +1098,22 @@
 			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 a1aed6e..c500302 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 "