Mercurial > vim

comparison src/ops.c @ 688:bcd2edc4539e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.0207
author vimboss
date Sat, 25 Feb 2006 21:52:33 +0000
parents 9364d114ed8d
children a28f83d37113
comparison
equal deleted inserted replaced
687:d4b8e06e7c96 688:bcd2edc4539e
5492 ca.retval = CA_NO_ADJ_OP_END; 5492 ca.retval = CA_NO_ADJ_OP_END;
5493 do_pending_operator(&ca, 0, TRUE); 5493 do_pending_operator(&ca, 0, TRUE);
5494 y_previous = old_y_previous; 5494 y_previous = old_y_previous;
5495 y_current = old_y_current; 5495 y_current = old_y_current;
5496 curwin->w_cursor = old_cursor; 5496 curwin->w_cursor = old_cursor;
5497 changed_cline_bef_curs(); /* need to update w_virtcol et al */
5497 curwin->w_curswant = old_curswant; 5498 curwin->w_curswant = old_curswant;
5498 curwin->w_set_curswant = old_set_curswant; 5499 curwin->w_set_curswant = old_set_curswant;
5499 curbuf->b_op_start = old_op_start; 5500 curbuf->b_op_start = old_op_start;
5500 curbuf->b_op_end = old_op_end; 5501 curbuf->b_op_end = old_op_end;
5501 #ifdef FEAT_VISUAL 5502 #ifdef FEAT_VISUAL
6131 { 6132 {
6132 oparg.is_VIsual = 1; 6133 oparg.is_VIsual = 1;
6133 oparg.block_mode = TRUE; 6134 oparg.block_mode = TRUE;
6134 oparg.op_type = OP_NOP; 6135 oparg.op_type = OP_NOP;
6135 getvcols(curwin, &min_pos, &max_pos, 6136 getvcols(curwin, &min_pos, &max_pos,
6136 &oparg.start_vcol, &oparg.end_vcol); 6137 &oparg.start_vcol, &oparg.end_vcol);
6138 if (curwin->w_curswant == MAXCOL)
6139 oparg.end_vcol = MAXCOL;
6137 /* Swap the start, end vcol if needed */ 6140 /* Swap the start, end vcol if needed */
6138 if (oparg.end_vcol < oparg.start_vcol) 6141 if (oparg.end_vcol < oparg.start_vcol)
6139 { 6142 {
6140 oparg.end_vcol += oparg.start_vcol; 6143 oparg.end_vcol += oparg.start_vcol;
6141 oparg.start_vcol = oparg.end_vcol - oparg.start_vcol; 6144 oparg.start_vcol = oparg.end_vcol - oparg.start_vcol;
6229 byte_count -= eol_size; 6232 byte_count -= eol_size;
6230 6233
6231 #ifdef FEAT_VISUAL 6234 #ifdef FEAT_VISUAL
6232 if (VIsual_active) 6235 if (VIsual_active)
6233 { 6236 {
6234 if (VIsual_mode == Ctrl_V) 6237 if (VIsual_mode == Ctrl_V && curwin->w_curswant < MAXCOL)
6235 { 6238 {
6236 getvcols(curwin, &min_pos, &max_pos, &min_pos.col, 6239 getvcols(curwin, &min_pos, &max_pos, &min_pos.col,
6237 &max_pos.col); 6240 &max_pos.col);
6238 sprintf((char *)buf1, _("%ld Cols; "), 6241 sprintf((char *)buf1, _("%ld Cols; "),
6239 (long)(oparg.end_vcol - oparg.start_vcol + 1)); 6242 (long)(oparg.end_vcol - oparg.start_vcol + 1));
6240 } 6243 }
6241 else 6244 else
6242 buf1[0] = NUL; 6245 buf1[0] = NUL;