Merge pull request #75 from wrywerytwreywery/wrap

minimize calls to reset_screen_size
This commit is contained in:
Anthony Scopatz 2015-03-16 22:55:45 -05:00
commit dd0312c61e

View file

@ -32,8 +32,6 @@ def setup_readline():
except ValueError: except ValueError:
# not all versions of readline have this symbol, ie Macs sometimes # not all versions of readline have this symbol, ie Macs sometimes
RL_COMPLETION_SUPPRESS_APPEND = None RL_COMPLETION_SUPPRESS_APPEND = None
#lib.rl_resize_terminal()
#lib.rl_reset_screen_size()
# reads in history # reads in history
env = builtins.__xonsh_env__ env = builtins.__xonsh_env__
hf = env.get('XONSH_HISTORY_FILE', os.path.expanduser('~/.xonsh_history')) hf = env.get('XONSH_HISTORY_FILE', os.path.expanduser('~/.xonsh_history'))
@ -175,10 +173,7 @@ class Shell(Cmd):
def prompt(self): def prompt(self):
"""Obtains the current prompt string.""" """Obtains the current prompt string."""
global lib global lib
if lib is not None: lib.rl_reset_screen_size()
lib.rl_reset_screen_size()
lib = None
#lib.rl_resize_terminal()
if self.need_more_lines: if self.need_more_lines:
if self.mlprompt is None: if self.mlprompt is None:
self.mlprompt = multiline_prompt() self.mlprompt = multiline_prompt()
@ -192,6 +187,4 @@ class Shell(Cmd):
else: else:
p = "set '$PROMPT = ...' $ " p = "set '$PROMPT = ...' $ "
self.settitle() self.settitle()
#lib.rl_resize_terminal()
#lib.rl_reset_screen_size()
return p return p