From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 23 Dec 2011 13:54:04 +0000 (+0100)
Subject: updated for version 7.3.385
X-Git-Tag: v7.3.385
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=637606413f3f67683a17286f1bb2d6ff01175dc8;p=vim

updated for version 7.3.385
Problem:    When using an expression mapping on the command line the cursor
            ends up in the wrong place. (Yasuhiro Matsumoto)
Solution:   Save and restore msg_col and msg_row when evaluating the
            expression.
---

diff --git a/src/getchar.c b/src/getchar.c
index a895483a4..c4457c4f0 100644
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -4510,6 +4510,8 @@ eval_map_expr(str, c)
     char_u	*expr;
     char_u	*save_cmd;
     pos_T	save_cursor;
+    int		save_msg_col;
+    int		save_msg_row;
 
     /* Remove escaping of CSI, because "str" is in a format to be used as
      * typeahead. */
@@ -4533,12 +4535,16 @@ eval_map_expr(str, c)
 #endif
     set_vim_var_char(c);  /* set v:char to the typed character */
     save_cursor = curwin->w_cursor;
+    save_msg_col = msg_col;
+    save_msg_row = msg_row;
     p = eval_to_string(expr, NULL, FALSE);
     --textlock;
 #ifdef FEAT_EX_EXTRA
     --ex_normal_lock;
 #endif
     curwin->w_cursor = save_cursor;
+    msg_col = save_msg_col;
+    msg_row = save_msg_row;
 
     restore_cmdline_alloc(save_cmd);
     vim_free(expr);
diff --git a/src/version.c b/src/version.c
index e57a4cf76..4e40bb3f7 100644
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    385,
 /**/
     384,
 /**/