diff --git a/insert.c b/insert.c index 645c05d..158ad0e 100644 --- a/insert.c +++ b/insert.c @@ -446,7 +446,7 @@ replacechar(int f, int n) if (isbackspace(c)) { /* vi beeps here */ s = TRUE; /* replaced with nothing */ } else { - t = s = lins_chars(n, c, FALSE); + t = s = lins_chars(n, c); } } } @@ -981,11 +981,11 @@ inschar(int c, int *backsp_limit_p) rc = inspound(); } else { autoindented = -1; - rc = lins_chars(1, c, FALSE); + rc = lins_chars(1, c); } } else { autoindented = -1; - rc = lins_chars(1, c, FALSE); + rc = lins_chars(1, c); } } return rc; @@ -1515,7 +1515,7 @@ quote_next(int f, int n) s = lnewline(); } while ((s == TRUE) && (--n != 0)); } else { - s = lins_chars(n, c, TRUE); + s = lins_chars(n, c); } } return s; diff --git a/line.c b/line.c index d56a6f6..bd5b8a5 100644 --- a/line.c +++ b/line.c @@ -534,7 +534,7 @@ lins_bytes(int n, int c) * or in insert-mode. */ int -lins_chars(int n, int c, int wide) +lins_chars(int n, int c) { int rc = FALSE; UCHAR target[10]; @@ -542,7 +542,7 @@ lins_chars(int n, int c, int wide) int nn; int mapped; - if (wide && (c > 127) && b_is_utfXX(curbp)) { + if ((c > 127) && b_is_utfXX(curbp)) { nbytes = vl_conv_to_utf8(target, (UINT) c, sizeof(target)); } else if (okCTYPE2(vl_wide_enc) && !vl_mb_is_8bit(c)) { nbytes = 1; diff --git a/proto.h b/proto.h index 4c8198f..77ab7e0 100644 --- a/proto.h +++ b/proto.h @@ -873,10 +873,10 @@ extern int lrepl_regex (REGEXVAL *expr, const char *iline, int ilen); #if OPT_MULTIBYTE extern int ldel_chars (B_COUNT n, int kflag); -extern int lins_chars (int n, int c, int wide); +extern int lins_chars (int n, int c); #else #define ldel_chars(n, kflag) ldel_bytes(n, kflag) -#define lins_chars(n, c, wide) lins_bytes(n, c) +#define lins_chars(n, c) lins_bytes(n, c) #endif #if OPT_REGS_CMPL