Remove POSIX 'cpoptions': '#'

This commit is contained in:
Michael Reed
2015-07-03 03:10:34 -04:00
parent fcb79ffc40
commit 96c27692b8
3 changed files with 4 additions and 22 deletions

View File

@@ -5735,22 +5735,10 @@ static void nv_optrans(cmdarg_T *cap)
static char_u *str = (char_u *)"xXDCsSY&";
if (!checkclearopq(cap->oap)) {
/* In Vi "2D" doesn't delete the next line. Can't translate it
* either, because "2." should also not use the count. */
if (cap->cmdchar == 'D' && vim_strchr(p_cpo, CPO_HASH) != NULL) {
cap->oap->start = curwin->w_cursor;
cap->oap->op_type = OP_DELETE;
set_op_var(OP_DELETE);
cap->count1 = 1;
nv_dollar(cap);
finish_op = true;
ResetRedobuff();
AppendCharToRedobuff('D');
} else {
if (cap->count0)
stuffnumReadbuff(cap->count0);
stuffReadbuff(ar[(int)(vim_strchr(str, cap->cmdchar) - str)]);
if (cap->count0) {
stuffnumReadbuff(cap->count0);
}
stuffReadbuff(ar[(int)(vim_strchr(str, cap->cmdchar) - str)]);
}
cap->opcount = 0;
}
@@ -6548,9 +6536,6 @@ static void n_opencmd(cmdarg_T *cap)
0, 0)) {
if (curwin->w_p_cole > 0 && oldline != curwin->w_cursor.lnum)
update_single_line(curwin, oldline);
/* When '#' is in 'cpoptions' ignore the count. */
if (vim_strchr(p_cpo, CPO_HASH) != NULL)
cap->count1 = 1;
invoke_edit(cap, false, cap->cmdchar, true);
}
}