2 files changed, 10 insertions, 0 deletions
diff --git a/src/eval.c b/src/eval.c
index 04772225c7..a3bf58d356 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -340,6 +340,7 @@ static struct vimvar
     {VV_NAME("scrollstart",	 VAR_STRING), 0},
     {VV_NAME("swapname",	 VAR_STRING), VV_RO},
     {VV_NAME("swapchoice",	 VAR_STRING), 0},
+    {VV_NAME("swapcommand",	 VAR_STRING), VV_RO},
 };
 
 /* shorthand */
diff --git a/src/main.c b/src/main.c
index 19bdb09e19..bd40c6c7ad 100644
--- a/src/main.c
+++ b/src/main.c
@@ -3492,6 +3492,15 @@ eval_client_expr_to_string(expr)
     redir_off = save_ro;
     --emsg_skip;
 
+    /* A client can tell us to redraw, but not to display the cursor, so do
+     * that here. */
+    setcursor();
+    out_flush();
+#ifdef FEAT_GUI
+    if (gui.in_use)
+	gui_update_cursor(FALSE, FALSE);
+#endif
+
     return res;
 }