diff options
| author | Sebastian Schmidt <yath@yath.de> | 2012-04-17 11:23:35 +0200 |
|---|---|---|
| committer | Sebastian Schmidt <yath@yath.de> | 2012-04-17 11:24:20 +0200 |
| commit | f4b417c62a4f272c4cf9a074d0f7a3a97201f9db (patch) | |
| tree | e2196f3b6361e2377c43ab47a3abf17d8f6afd77 /lib/readline/terminal.c | |
| parent | 791237e44695d2ee123c8a6f665ef074f5fadfbb (diff) | |
| download | external_bash-f4b417c62a4f272c4cf9a074d0f7a3a97201f9db.zip external_bash-f4b417c62a4f272c4cf9a074d0f7a3a97201f9db.tar.gz external_bash-f4b417c62a4f272c4cf9a074d0f7a3a97201f9db.tar.bz2 | |
Update to upstream bash 4.2
This upgrades bash to from 4.1-rc to 4.2-release. See CWRU/changelog for
changes.
Change-Id: I926269c300cf44fa25964b5b375a148fcf11c4b7
Diffstat (limited to 'lib/readline/terminal.c')
| -rw-r--r-- | lib/readline/terminal.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/readline/terminal.c b/lib/readline/terminal.c index ee13092..f8c2f6e 100644 --- a/lib/readline/terminal.c +++ b/lib/readline/terminal.c @@ -96,12 +96,12 @@ static char *term_string_buffer = (char *)NULL; static int tcap_initialized; -#if !defined (__linux__) +#if !defined (__linux__) && !defined (NCURSES_VERSION) # if defined (__EMX__) || defined (NEED_EXTERN_PC) extern # endif /* __EMX__ || NEED_EXTERN_PC */ char PC, *BC, *UP; -#endif /* __linux__ */ +#endif /* !__linux__ && !NCURSES_VERSION */ /* Some strings to control terminal actions. These are output by tputs (). */ char *_rl_term_clreol; @@ -350,9 +350,9 @@ rl_reset_screen_size () void rl_resize_terminal () { + _rl_get_screen_size (fileno (rl_instream), 1); if (_rl_echoing_p) { - _rl_get_screen_size (fileno (rl_instream), 1); if (CUSTOM_REDISPLAY_FUNC ()) rl_forced_update_display (); else if (RL_ISSTATE(RL_STATE_REDISPLAYING) == 0) |