updated for version 7.2-164

diff --git a/src/normal.c b/src/normal.c
index 324133047cee8cbb7b61280b7d3a6d0d8fe68893..326995e6d892c0fdb5d1be53f08d2addcc4ff5a1 100644 (file)
--- a/src/normal.c
+++ b/src/normal.c
@@ -3709,13 +3709,13 @@ clear_showcmd()
 #ifdef FEAT_VISUAL
     if (VIsual_active && !char_avail())
     {
-       int             i = lt(VIsual, curwin->w_cursor);
+       int             cursor_bot = lt(VIsual, curwin->w_cursor);
        long            lines;
        colnr_T         leftcol, rightcol;
        linenr_T        top, bot;
 
        /* Show the size of the Visual area. */
-       if (i)
+       if (cursor_bot)
        {
            top = VIsual.lnum;
            bot = curwin->w_cursor.lnum;
@@ -3734,14 +3734,23 @@ clear_showcmd()
 
        if (VIsual_mode == Ctrl_V)
        {
+#ifdef FEAT_LINEBREAK
+           char_u *saved_sbr = p_sbr;
+
+           /* Make 'sbr' empty for a moment to get the correct size. */
+           p_sbr = empty_option;
+#endif
            getvcols(curwin, &curwin->w_cursor, &VIsual, &leftcol, &rightcol);
+#ifdef FEAT_LINEBREAK
+           p_sbr = saved_sbr;
+#endif
            sprintf((char *)showcmd_buf, "%ldx%ld", lines,
                                              (long)(rightcol - leftcol + 1));
        }
        else if (VIsual_mode == 'V' || VIsual.lnum != curwin->w_cursor.lnum)
            sprintf((char *)showcmd_buf, "%ld", lines);
        else
-           sprintf((char *)showcmd_buf, "%ld", (long)(i
+           sprintf((char *)showcmd_buf, "%ld", (long)(cursor_bot
                    ? curwin->w_cursor.col - VIsual.col
                    : VIsual.col - curwin->w_cursor.col) + (*p_sel != 'e'));
        showcmd_buf[SHOWCMD_COLS] = NUL;        /* truncate */

diff --git a/src/ops.c b/src/ops.c
index b8bb53851a792eb07ed282def00a881cfa6cb4fa..da9fafb7914df1d8f46cea3da636c89a14e719ba 100644 (file)
--- a/src/ops.c
+++ b/src/ops.c
@@ -392,7 +392,6 @@ shift_block(oap, amount)
     colnr_T            ws_vcol;
     int                        i = 0, j = 0;
     int                        len;
-
 #ifdef FEAT_RIGHTLEFT
     int                        old_p_ri = p_ri;
 
@@ -6284,11 +6283,20 @@ cursor_pos_info()
 
            if (VIsual_mode == Ctrl_V)
            {
+#ifdef FEAT_LINEBREAK
+               char_u * saved_sbr = p_sbr;
+
+               /* Make 'sbr' empty for a moment to get the correct size. */
+               p_sbr = empty_option;
+#endif
                oparg.is_VIsual = 1;
                oparg.block_mode = TRUE;
                oparg.op_type = OP_NOP;
                getvcols(curwin, &min_pos, &max_pos,
                                          &oparg.start_vcol, &oparg.end_vcol);
+#ifdef FEAT_LINEBREAK
+               p_sbr = saved_sbr;
+#endif
                if (curwin->w_curswant == MAXCOL)
                    oparg.end_vcol = MAXCOL;
                /* Swap the start, end vcol if needed */

diff --git a/src/version.c b/src/version.c
index dbd9ddd2608d81df78a47e95d79e7922b69f2047..5d1472deb255963f02ec4e677610ebe29a155f4f 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -676,6 +676,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    164,
 /**/
     163,
 /**/