From: Bram Moolenaar Date: Thu, 17 Jan 2013 12:24:08 +0000 (+0100) Subject: updated for version 7.3.763 X-Git-Tag: v7.3.763 X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=8754deb3b622186ff5efa0e5547a392aaed6a1c7;p=thirdparty%2Fvim.git updated for version 7.3.763 Problem: Jumping to a mark does not open a fold if it is in the same line. (Wiktor Ruben) Solution: Also compare the column after the jump. (Christian Brabandt) --- diff --git a/src/normal.c b/src/normal.c index 4d0bbdbea5..3d5b6d8171 100644 --- a/src/normal.c +++ b/src/normal.c @@ -7523,7 +7523,7 @@ nv_gomark(cap) pos_T *pos; int c; #ifdef FEAT_FOLDING - linenr_T lnum = curwin->w_cursor.lnum; + pos_T old_cursor = curwin->w_cursor; int old_KeyTyped = KeyTyped; /* getting file may reset it */ #endif @@ -7552,7 +7552,7 @@ nv_gomark(cap) #endif #ifdef FEAT_FOLDING if (cap->oap->op_type == OP_NOP - && (pos == (pos_T *)-1 || lnum != curwin->w_cursor.lnum) + && (pos == (pos_T *)-1 || !equalpos(old_cursor, *pos)) && (fdo_flags & FDO_MARK) && old_KeyTyped) foldOpenCursor(); diff --git a/src/version.c b/src/version.c index 012ae87e3d..83b1bc4ad7 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 */ +/**/ + 763, /**/ 762, /**/