d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge conflict after official patch

Browse Source
This commit is contained in:
Andrey A. Chernov 2006-12-31 09:47:34 +00:00
parent b1b027ee15
commit 4ccf11657b
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/libreadline/display.c
View File

@ -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));