diff options
| author | Patrick Palka <patrick@parcs.ath.cx> | 2015-07-25 15:41:05 -0400 |
|---|---|---|
| committer | Patrick Palka <patrick@parcs.ath.cx> | 2015-07-25 15:57:00 -0400 |
| commit | 5836a818eccb180d75c92ce4c861abb6fe8dec23 (patch) | |
| tree | 624044ca5df5a6c192e47933a735ab4fe9aaea71 /readline/mbutil.c | |
| parent | b8cc7b2e9afab37eb9a7cff0d3ae4ebbcf7d494f (diff) | |
| download | gdb-5836a818eccb180d75c92ce4c861abb6fe8dec23.zip gdb-5836a818eccb180d75c92ce4c861abb6fe8dec23.tar.gz gdb-5836a818eccb180d75c92ce4c861abb6fe8dec23.tar.bz2 | |
Revert "Sync readline/ to version 7.0 alpha"
This reverts commit b558ff043d41ba8d17a82f5f9ae5f9dade66160e.
This reverts commit 4a11f2065906976675808364ddbd1c0f77eea41f.
The initial import commit failed to retain local changes made to
readline's configure.in (and the commit message erroneously stated that
there were no local changes that needed to be reapplied). Also the
import caused a couple of build errors and a scattering of testsuite
regressions throughout many arches. It's probably better to start over
with this import, hopefully more carefully next time.
Diffstat (limited to 'readline/mbutil.c')
| -rw-r--r-- | readline/mbutil.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/readline/mbutil.c b/readline/mbutil.c index b036e0c..eeb7e55 100644 --- a/readline/mbutil.c +++ b/readline/mbutil.c @@ -64,9 +64,6 @@ int rl_byte_oriented = 0; int rl_byte_oriented = 1; #endif -/* Ditto */ -int _rl_utf8locale = 0; - /* **************************************************************** */ /* */ /* Multibyte Character Utility Functions */ @@ -122,7 +119,7 @@ _rl_find_next_mbchar_internal (string, seed, count, find_non_zero) point += tmp; if (find_non_zero) { - if (WCWIDTH (wc) == 0) + if (wcwidth (wc) == 0) continue; else count--; @@ -135,7 +132,7 @@ _rl_find_next_mbchar_internal (string, seed, count, find_non_zero) if (find_non_zero) { tmp = mbrtowc (&wc, string + point, strlen (string + point), &ps); - while (MB_NULLWCH (tmp) == 0 && MB_INVALIDCH (tmp) == 0 && WCWIDTH (wc) == 0) + while (MB_NULLWCH (tmp) == 0 && MB_INVALIDCH (tmp) == 0 && wcwidth (wc) == 0) { point += tmp; tmp = mbrtowc (&wc, string + point, strlen (string + point), &ps); @@ -187,7 +184,7 @@ _rl_find_prev_mbchar_internal (string, seed, find_non_zero) { if (find_non_zero) { - if (WCWIDTH (wc) != 0) + if (wcwidth (wc) != 0) prev = point; } else @@ -266,7 +263,7 @@ _rl_compare_chars (buf1, pos1, ps1, buf2, pos2, ps2) if point is invalied (point < 0 || more than string length), it returns -1 */ int -_rl_adjust_point (string, point, ps) +_rl_adjust_point(string, point, ps) char *string; int point; mbstate_t *ps; |