diff options
| author | ache <ache@FreeBSD.org> | 2006-03-27 23:53:05 +0000 |
|---|---|---|
| committer | ache <ache@FreeBSD.org> | 2006-03-27 23:53:05 +0000 |
| commit | 593cd30b45b4a08a2e0938c2eeccfeff0b87c94e (patch) | |
| tree | 76ebd456ed0476a1d4e9dbe5da2ad31e9b823df7 /contrib/libreadline/terminal.c | |
| parent | 255936645ee180cbe2421e975b37ca5a0b909f0d (diff) | |
| download | FreeBSD-src-593cd30b45b4a08a2e0938c2eeccfeff0b87c94e.zip FreeBSD-src-593cd30b45b4a08a2e0938c2eeccfeff0b87c94e.tar.gz | |
Merge conflicts after official patches
Diffstat (limited to 'contrib/libreadline/terminal.c')
| -rw-r--r-- | contrib/libreadline/terminal.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/contrib/libreadline/terminal.c b/contrib/libreadline/terminal.c index e2cb8dc..ef7d35b 100644 --- a/contrib/libreadline/terminal.c +++ b/contrib/libreadline/terminal.c @@ -123,7 +123,7 @@ char *_rl_term_up; static char *_rl_visible_bell; /* Non-zero means the terminal can auto-wrap lines. */ -int _rl_term_autowrap; +int _rl_term_autowrap = -1; /* Non-zero means that this terminal has a meta key. */ static int term_has_meta; @@ -275,6 +275,9 @@ void _rl_set_screen_size (rows, cols) int rows, cols; { + if (_rl_term_autowrap == -1) + _rl_init_terminal_io (rl_terminal_name); + if (rows > 0) _rl_screenheight = rows; if (cols > 0) |
