aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

updated for version 7.2-164

Browse Source
This commit is contained in:
Bram Moolenaar
2009-04-29 15:41:40 +00:00
parent 876f6d7f3c
commit 81d00078be
3 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/normal.c
View File

@@ -3709,13 +3709,13 @@ clear_showcmd()
#ifdef FEAT_VISUAL #ifdef FEAT_VISUAL
if (VIsual_active && !char_avail()) if (VIsual_active && !char_avail())
{ {
int i = lt(VIsual, curwin->w_cursor); int cursor_bot = lt(VIsual, curwin->w_cursor);
long lines; long lines;
colnr_T leftcol, rightcol; colnr_T leftcol, rightcol;
linenr_T top, bot; linenr_T top, bot;
/* Show the size of the Visual area. */ /* Show the size of the Visual area. */
if (i) if (cursor_bot)
{ {
top = VIsual.lnum; top = VIsual.lnum;
bot = curwin->w_cursor.lnum; bot = curwin->w_cursor.lnum;
@@ -3734,14 +3734,23 @@ clear_showcmd()
if (VIsual_mode == Ctrl_V) 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); getvcols(curwin, &curwin->w_cursor, &VIsual, &leftcol, &rightcol);
#ifdef FEAT_LINEBREAK
p_sbr = saved_sbr;
#endif
sprintf((char *)showcmd_buf, "%ldx%ld", lines, sprintf((char *)showcmd_buf, "%ldx%ld", lines,
(long)(rightcol - leftcol + 1)); (long)(rightcol - leftcol + 1));
} }
else if (VIsual_mode == 'V' || VIsual.lnum != curwin->w_cursor.lnum) else if (VIsual_mode == 'V' || VIsual.lnum != curwin->w_cursor.lnum)
sprintf((char *)showcmd_buf, "%ld", lines); sprintf((char *)showcmd_buf, "%ld", lines);
else else
sprintf((char *)showcmd_buf, "%ld", (long)(i sprintf((char *)showcmd_buf, "%ld", (long)(cursor_bot
? curwin->w_cursor.col - VIsual.col ? curwin->w_cursor.col - VIsual.col
: VIsual.col - curwin->w_cursor.col) + (*p_sel != 'e')); : VIsual.col - curwin->w_cursor.col) + (*p_sel != 'e'));
showcmd_buf[SHOWCMD_COLS] = NUL; /* truncate */ showcmd_buf[SHOWCMD_COLS] = NUL; /* truncate */

10
src/ops.c
View File

@@ -392,7 +392,6 @@ shift_block(oap, amount)
colnr_T ws_vcol; colnr_T ws_vcol;
int i = 0, j = 0; int i = 0, j = 0;
int len; int len;
#ifdef FEAT_RIGHTLEFT #ifdef FEAT_RIGHTLEFT
int old_p_ri = p_ri; int old_p_ri = p_ri;
@@ -6284,11 +6283,20 @@ cursor_pos_info()
if (VIsual_mode == Ctrl_V) 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.is_VIsual = 1;
oparg.block_mode = TRUE; oparg.block_mode = TRUE;
oparg.op_type = OP_NOP; oparg.op_type = OP_NOP;
getvcols(curwin, &min_pos, &max_pos, getvcols(curwin, &min_pos, &max_pos,
&oparg.start_vcol, &oparg.end_vcol); &oparg.start_vcol, &oparg.end_vcol);
#ifdef FEAT_LINEBREAK
p_sbr = saved_sbr;
#endif
if (curwin->w_curswant == MAXCOL) if (curwin->w_curswant == MAXCOL)
oparg.end_vcol = MAXCOL; oparg.end_vcol = MAXCOL;
/* Swap the start, end vcol if needed */ /* Swap the start, end vcol if needed */

2
src/version.c
View File

@@ -676,6 +676,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
164,
/**/ /**/
163, 163,
/**/ /**/