remove redundant code
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2238 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
Этот коммит содержится в:
родитель
0251bdb0a5
Коммит
9ac20c85b0
23
src/winio.c
23
src/winio.c
@ -2206,9 +2206,7 @@ size_t display_string_len(const char *buf, size_t start_col, size_t
|
|||||||
/* If we have a control character, add one byte to account
|
/* If we have a control character, add one byte to account
|
||||||
* for the "^" that will be displayed in front of it, and
|
* for the "^" that will be displayed in front of it, and
|
||||||
* then add the number of bytes for its visible equivalent
|
* then add the number of bytes for its visible equivalent
|
||||||
* as returned by control_rep(). If we have an invalid
|
* as returned by control_rep(). */
|
||||||
* multibyte control character, interpret that character as
|
|
||||||
* though it's a normal control character. */
|
|
||||||
else if (is_cntrl_char(wide_buf)) {
|
else if (is_cntrl_char(wide_buf)) {
|
||||||
char ctrl_wide_buf =
|
char ctrl_wide_buf =
|
||||||
control_rep((unsigned char)wide_buf);
|
control_rep((unsigned char)wide_buf);
|
||||||
@ -2222,25 +2220,6 @@ size_t display_string_len(const char *buf, size_t start_col, size_t
|
|||||||
/* If we have a normal character, add its width in bytes
|
/* If we have a normal character, add its width in bytes
|
||||||
* normally. */
|
* normally. */
|
||||||
} else
|
} else
|
||||||
#ifdef NANO_WIDE
|
|
||||||
/* If buf contains an invalid multibyte non-control
|
|
||||||
* character, interpret that character as though it's a
|
|
||||||
* normal non-control character. */
|
|
||||||
if (!ISSET(NO_UTF8) && bad_char) {
|
|
||||||
char *bad_wide_buf = charalloc(MB_CUR_MAX);
|
|
||||||
int bad_wide_buf_len;
|
|
||||||
|
|
||||||
bad_wide_buf_len = wctomb(bad_wide_buf,
|
|
||||||
(wchar_t)wide_buf);
|
|
||||||
|
|
||||||
free(bad_wide_buf);
|
|
||||||
|
|
||||||
if (bad_wide_buf_len != -1)
|
|
||||||
retval += bad_wide_buf_len;
|
|
||||||
else
|
|
||||||
retval++;
|
|
||||||
} else
|
|
||||||
#endif
|
|
||||||
retval += wide_buf_len;
|
retval += wide_buf_len;
|
||||||
#ifdef NANO_WIDE
|
#ifdef NANO_WIDE
|
||||||
}
|
}
|
||||||
|
Загрузка…
Ссылка в новой задаче
Block a user