From 8fe8d9ed064d1a7c41fc43a565513dc41fd3aaed Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 13 Feb 2013 16:10:17 +0100
Subject: [PATCH] updated for version 7.3.812 Problem: When 'indentexpr'
moves the cursor "curswant" not restored. Solution: Restore "curswant".
(Sung Pae)
---
src/misc1.c | 14 +++++++++++---
src/version.c | 2 ++
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/misc1.c b/src/misc1.c
index ab42f04db1..e2c92090b3 100644
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -8809,12 +8809,18 @@ find_match(lookfor, ourscope, ind_maxparen, ind_maxcomment)
get_expr_indent()
{
int indent;
- pos_T pos;
+ pos_T save_pos;
+ colnr_T save_curswant;
+ int save_set_curswant;
int save_State;
int use_sandbox = was_set_insecurely((char_u *)"indentexpr",
OPT_LOCAL);
- pos = curwin->w_cursor;
+ /* Save and restore cursor position and curswant, in case it was changed
+ * via :normal commands */
+ save_pos = curwin->w_cursor;
+ save_curswant = curwin->w_curswant;
+ save_set_curswant = curwin->w_set_curswant;
set_vim_var_nr(VV_LNUM, curwin->w_cursor.lnum);
if (use_sandbox)
++sandbox;
@@ -8829,7 +8835,9 @@ get_expr_indent()
* command. */
save_State = State;
State = INSERT;
- curwin->w_cursor = pos;
+ curwin->w_cursor = save_pos;
+ curwin->w_curswant = save_curswant;
+ curwin->w_set_curswant = save_set_curswant;
check_cursor();
State = save_State;
diff --git a/src/version.c b/src/version.c
index 1ce53266ba..4429b0f0f2 100644
--- a/src/version.c
+++ b/src/version.c
@@ -725,6 +725,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 812,
/**/
811,
/**/
--
GitLab