From c8b133496985c9d5d533827f95bb01460ad34e1c Mon Sep 17 00:00:00 2001 From: ZyX Date: Mon, 8 Sep 2014 23:31:33 +0400 Subject: [PATCH] Do not use _POWERLINE_SHORTENED_PATH or unset it shortly after using Fixes #1068 --- powerline/bindings/zsh/__init__.py | 3 +++ powerline/bindings/zsh/powerline.zsh | 8 +------- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/powerline/bindings/zsh/__init__.py b/powerline/bindings/zsh/__init__.py index 46940c80..3f91012a 100644 --- a/powerline/bindings/zsh/__init__.py +++ b/powerline/bindings/zsh/__init__.py @@ -129,6 +129,7 @@ class Prompt(object): def __str__(self): zsh.eval('_POWERLINE_PARSER_STATE="${(%):-%_}"') + zsh.eval('_POWERLINE_SHORTENED_PATH="${(%):-%~}"') segment_info = { 'args': self.args, 'environ': environ, @@ -137,6 +138,8 @@ class Prompt(object): 'parser_state': zsh.getvalue('_POWERLINE_PARSER_STATE'), 'shortened_path': zsh.getvalue('_POWERLINE_SHORTENED_PATH'), } + zsh.setvalue('_POWERLINE_PARSER_STATE', None) + zsh.setvalue('_POWERLINE_SHORTENED_PATH', None) r = '' if self.above: for line in self.powerline.render_above_lines( diff --git a/powerline/bindings/zsh/powerline.zsh b/powerline/bindings/zsh/powerline.zsh index 0c097b66..162d44f9 100644 --- a/powerline/bindings/zsh/powerline.zsh +++ b/powerline/bindings/zsh/powerline.zsh @@ -103,10 +103,6 @@ _powerline_set_jobnum() { _POWERLINE_JOBNUM=${(%):-%j} } -_powerline_set_shortened_path() { - _POWERLINE_SHORTENED_PATH="${(%):-%~}" -} - _powerline_update_counter() { zpython '_powerline.precmd()' } @@ -120,8 +116,6 @@ _powerline_setup_prompt() { fi done precmd_functions+=( _powerline_set_jobnum ) - chpwd_functions+=( _powerline_set_shortened_path ) - _powerline_set_shortened_path VIRTUAL_ENV_DISABLE_PROMPT=1 @@ -144,7 +138,7 @@ _powerline_setup_prompt() { add_args+=' --last_exit_code=$?' add_args+=' --last_pipe_status="$pipestatus"' add_args+=' --renderer_arg="client_id=$$"' - add_args+=' --renderer_arg="shortened_path=$_POWERLINE_SHORTENED_PATH"' + add_args+=' --renderer_arg="shortened_path=${(%):-%~}"' add_args+=' --jobnum=$_POWERLINE_JOBNUM' local new_args_2=' --renderer_arg="parser_state=${(%%):-%_}"' new_args_2+=' --renderer_arg="local_theme=continuation"'