aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeerthan Jaic <jckeerthan@gmail.com>2014-04-02 19:34:37 -0400
committerThiago de Arruda <tpadilha84@gmail.com>2014-04-04 16:05:12 -0300
commit3fe0580a8edae062c91fda83fcb2766188088f2e (patch)
tree292235fdf560784461654e6f4dcbe28231c28b28
parentb83600f5a3e6be2a8123a74595fe297759a57736 (diff)
downloadrneovim-3fe0580a8edae062c91fda83fcb2766188088f2e.tar.gz
rneovim-3fe0580a8edae062c91fda83fcb2766188088f2e.tar.bz2
rneovim-3fe0580a8edae062c91fda83fcb2766188088f2e.zip
vim-patch:7.4.169
Problem: ":sleep" puts cursor in the wrong column. (Liang Li) Solution: Add the window offset. (Christian Brabandt) https://code.google.com/p/vim/source/detail?r=4e3a9dd25d428e7c08ed401afc244972e27e08e6
-rw-r--r--src/ex_docmd.c2
-rw-r--r--src/version.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 888148eb69..4d80c9462e 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -6708,7 +6708,7 @@ static void ex_sleep(exarg_T *eap)
if (cursor_valid()) {
n = W_WINROW(curwin) + curwin->w_wrow - msg_scrolled;
if (n >= 0)
- windgoto((int)n, curwin->w_wcol);
+ windgoto((int)n, W_WINCOL(curwin) + curwin->w_wcol);
}
len = eap->line2;
diff --git a/src/version.c b/src/version.c
index f7d21c26a1..f7f6a7e730 100644
--- a/src/version.c
+++ b/src/version.c
@@ -221,6 +221,9 @@ static char *(features[]) = {
static int included_patches[] = {
// Add new patch number below this line
+ 169,
+ //168,
+ //167,
166,
//165,
//164,