diff options
| author | ache <ache@FreeBSD.org> | 2007-04-12 14:45:25 +0000 |
|---|---|---|
| committer | ache <ache@FreeBSD.org> | 2007-04-12 14:45:25 +0000 |
| commit | 59d75ef9f0021337d6402826b2f8170645e65eb2 (patch) | |
| tree | d0b3b35b328e46ad387b5bb01ebfabe76bf226c7 /contrib | |
| parent | 310f11e8ad5efdee945c5b420093b94a3eb1e094 (diff) | |
| download | FreeBSD-src-59d75ef9f0021337d6402826b2f8170645e65eb2.zip FreeBSD-src-59d75ef9f0021337d6402826b2f8170645e65eb2.tar.gz | |
Merge
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/libreadline/FREEBSD-upgrade | 1 | ||||
| -rw-r--r-- | contrib/libreadline/display.c | 12 |
2 files changed, 13 insertions, 0 deletions
diff --git a/contrib/libreadline/FREEBSD-upgrade b/contrib/libreadline/FREEBSD-upgrade index 87000ca..1e35444 100644 --- a/contrib/libreadline/FREEBSD-upgrade +++ b/contrib/libreadline/FREEBSD-upgrade @@ -1,6 +1,7 @@ # $FreeBSD$ # # Official patch 001 imported as v5_2_p1 +# Official patch 002 imported as v5_2_p2 # rm doc/*.dvi doc/*.html doc/*.ps doc/*.0 doc/*.info doc/*.tex doc/texi2* doc/*.pdf diff --git a/contrib/libreadline/display.c b/contrib/libreadline/display.c index 927f927..399cd4b 100644 --- a/contrib/libreadline/display.c +++ b/contrib/libreadline/display.c @@ -562,14 +562,26 @@ rl_redisplay () wrap_offset = prompt_invis_chars_first_line = 0; } +#if defined (HANDLE_MULTIBYTE) #define CHECK_INV_LBREAKS() \ do { \ if (newlines >= (inv_lbsize - 2)) \ { \ inv_lbsize *= 2; \ inv_lbreaks = (int *)xrealloc (inv_lbreaks, inv_lbsize * sizeof (int)); \ + _rl_wrapped_line = (int *)xrealloc (_rl_wrapped_line, inv_lbsize * sizeof (int)); \ } \ } while (0) +#else +#define CHECK_INV_LBREAKS() \ + do { \ + if (newlines >= (inv_lbsize - 2)) \ + { \ + inv_lbsize *= 2; \ + inv_lbreaks = (int *)xrealloc (inv_lbreaks, inv_lbsize * sizeof (int)); \ + } \ + } while (0) +#endif /* HANDLE_MULTIBYTE */ #if defined (HANDLE_MULTIBYTE) #define CHECK_LPOS() \ |
