comparison src/normal.c @ 1573:0e3bd80a3f74 v7.1.286

updated for version 7.1-286
author vimboss
date Tue, 01 Apr 2008 10:06:39 +0000
parents cc4fe241baa3
children b9740fb41986
comparison
equal deleted inserted replaced
1572:a9e353f7fcc4 1573:0e3bd80a3f74
8343 cmdarg_T *cap; 8343 cmdarg_T *cap;
8344 { 8344 {
8345 int n; 8345 int n;
8346 int word_end; 8346 int word_end;
8347 int flag = FALSE; 8347 int flag = FALSE;
8348 pos_T startpos = curwin->w_cursor;
8348 8349
8349 /* 8350 /*
8350 * Set inclusive for the "E" and "e" command. 8351 * Set inclusive for the "E" and "e" command.
8351 */ 8352 */
8352 if (cap->cmdchar == 'e' || cap->cmdchar == 'E') 8353 if (cap->cmdchar == 'e' || cap->cmdchar == 'E')
8403 if (word_end) 8404 if (word_end)
8404 n = end_word(cap->count1, cap->arg, flag, FALSE); 8405 n = end_word(cap->count1, cap->arg, flag, FALSE);
8405 else 8406 else
8406 n = fwd_word(cap->count1, cap->arg, cap->oap->op_type != OP_NOP); 8407 n = fwd_word(cap->count1, cap->arg, cap->oap->op_type != OP_NOP);
8407 8408
8408 /* Don't leave the cursor on the NUL past the end of line. */ 8409 /* Don't leave the cursor on the NUL past the end of line. Unless we
8409 if (n != FAIL) 8410 * didn't move it forward. */
8411 if (lt(startpos, curwin->w_cursor))
8410 adjust_cursor(cap->oap); 8412 adjust_cursor(cap->oap);
8411 8413
8412 if (n == FAIL && cap->oap->op_type == OP_NOP) 8414 if (n == FAIL && cap->oap->op_type == OP_NOP)
8413 clearopbeep(cap->oap); 8415 clearopbeep(cap->oap);
8414 else 8416 else