diff options
| author | Tuowen Zhao <ztuowen@gmail.com> | 2019-12-04 18:47:31 -0700 |
|---|---|---|
| committer | Tuowen Zhao <ztuowen@gmail.com> | 2019-12-04 18:47:31 -0700 |
| commit | 9ea85c9348827954d7886306268b54614eb0b03c (patch) | |
| tree | 067666d643f2957cced426ffbbce485d08b383fd /plugins/tmux | |
| parent | 9c851a9b820a70b8d23dee0b51220d009e749cec (diff) | |
| parent | 903a3e9daa110944a9edc37a5952b4a9ff630b39 (diff) | |
| download | zsh-9ea85c9348827954d7886306268b54614eb0b03c.tar.gz zsh-9ea85c9348827954d7886306268b54614eb0b03c.tar.bz2 zsh-9ea85c9348827954d7886306268b54614eb0b03c.zip | |
Merge branch 'master' of https://github.com/ohmyzsh/ohmyzsh
Diffstat (limited to 'plugins/tmux')
| -rw-r--r-- | plugins/tmux/README.md | 3 | ||||
| -rw-r--r-- | plugins/tmux/tmux.plugin.zsh | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/plugins/tmux/README.md b/plugins/tmux/README.md index 1e25af38f..db57f5be2 100644 --- a/plugins/tmux/README.md +++ b/plugins/tmux/README.md @@ -37,4 +37,5 @@ The plugin also supports the following - | `ZSH_TMUX_ITERM2` | Sets the `-CC` option for iTerm2 tmux integration (default: `false`) | | `ZSH_TMUX_FIXTERM_WITHOUT_256COLOR` | `$TERM` to use for non 256-color terminals (default: `screen`) | | `ZSH_TMUX_FIXTERM_WITH_256COLOR` | `$TERM` to use for 256-color terminals (default: `screen-256color` | -| `ZSH_TMUX_CONFIG` | Set the configuration path (default: `$HOME/.tmux.conf`) |
\ No newline at end of file +| `ZSH_TMUX_CONFIG` | Set the configuration path (default: `$HOME/.tmux.conf`) | +| `ZSH_TMUX_UNICODE` | Set `tmux -u` option to support unicode | diff --git a/plugins/tmux/tmux.plugin.zsh b/plugins/tmux/tmux.plugin.zsh index dad3db578..e52443a71 100644 --- a/plugins/tmux/tmux.plugin.zsh +++ b/plugins/tmux/tmux.plugin.zsh @@ -36,6 +36,8 @@ alias tkss='tmux kill-session -t' : ${ZSH_TMUX_FIXTERM_WITH_256COLOR:=screen-256color} # Set the configuration path : ${ZSH_TMUX_CONFIG:=$HOME/.tmux.conf} +# Set -u option to support unicode +: ${ZSH_TMUX_UNICODE:=false} # Determine if the terminal supports 256 colors if [[ $terminfo[colors] == 256 ]]; then @@ -62,6 +64,7 @@ function _zsh_tmux_plugin_run() { local -a tmux_cmd tmux_cmd=(command tmux) [[ "$ZSH_TMUX_ITERM2" == "true" ]] && tmux_cmd+=(-CC) + [[ "$ZSH_TMUX_UNICODE" == "true" ]] && tmux_cmd+=(-u) # Try to connect to an existing session. [[ "$ZSH_TMUX_AUTOCONNECT" == "true" ]] && $tmux_cmd attach |