diff --git a/src/edit.c b/src/edit.c
index 4ee21d5..a804415 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -4691,18 +4691,12 @@
 				     (int)STRLEN(compl_pattern), curs_col);
 	    if (compl_xp.xp_context == EXPAND_UNSUCCESSFUL
 		    || compl_xp.xp_context == EXPAND_NOTHING)
-	    {
+		/* No completion possible, use an empty pattern to get a
+		 * "pattern not found" message. */
 		compl_col = curs_col;
-		compl_length = 0;
-		vim_free(compl_pattern);
-		compl_pattern = NULL;
-	    }
 	    else
-	    {
-		startcol = (int)(compl_xp.xp_pattern - compl_pattern);
-		compl_col = startcol;
-		compl_length = curs_col - startcol;
-	    }
+		compl_col = (int)(compl_xp.xp_pattern - compl_pattern);
+	    compl_length = curs_col - compl_col;
 	}
 	else if (ctrl_x_mode == CTRL_X_FUNCTION || ctrl_x_mode == CTRL_X_OMNI)
 	{
diff --git a/src/version.c b/src/version.c
index 5cfc234..7ed4e4b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    61,
+/**/
     60,
 /**/
     59,