diff options
| author | ache <ache@FreeBSD.org> | 2006-12-31 09:47:34 +0000 |
|---|---|---|
| committer | ache <ache@FreeBSD.org> | 2006-12-31 09:47:34 +0000 |
| commit | 39ca0b10bbf6c75195e99403d4848e390b1620e1 (patch) | |
| tree | 409a3a4ecff2376718e87e1462d89b9309b8ef7b /contrib/libreadline | |
| parent | 551798c6ace22b8bfb492536d482b5106659bfce (diff) | |
| download | FreeBSD-src-39ca0b10bbf6c75195e99403d4848e390b1620e1.zip FreeBSD-src-39ca0b10bbf6c75195e99403d4848e390b1620e1.tar.gz | |
Merge conflict after official patch
Diffstat (limited to 'contrib/libreadline')
| -rw-r--r-- | contrib/libreadline/display.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/contrib/libreadline/display.c b/contrib/libreadline/display.c index 5af831b..927f927 100644 --- a/contrib/libreadline/display.c +++ b/contrib/libreadline/display.c @@ -2381,6 +2381,8 @@ _rl_col_width (str, start, end) if (end <= start) return 0; + if (MB_CUR_MAX == 1 || rl_byte_oriented) + return (end - start); memset (&ps, 0, sizeof (mbstate_t)); |
