diff options
| author | Andrew Janke <andrew@apjanke.net> | 2015-08-31 13:29:54 -0400 |
|---|---|---|
| committer | Andrew Janke <andrew@apjanke.net> | 2015-09-03 12:50:55 -0400 |
| commit | 82c76f6b5c2718622a532fb759231e8d24171413 (patch) | |
| tree | b0126f6d9b3ed508c1a6d9b21df56e2523e0555f /lib | |
| parent | fe92ea98e0633784508e85d6b756b1c3f667b2a4 (diff) | |
| parent | ba5fd57c1ff4a8523715bab6acc35dbbeff88af7 (diff) | |
| download | zsh-82c76f6b5c2718622a532fb759231e8d24171413.tar.gz zsh-82c76f6b5c2718622a532fb759231e8d24171413.tar.bz2 zsh-82c76f6b5c2718622a532fb759231e8d24171413.zip | |
Merge changes from #4241 into installer-portable-colors
Conflicts:
tools/install.sh
tools/upgrade.sh
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/functions.zsh | 16 | ||||
| -rw-r--r-- | lib/termsupport.zsh | 9 |
2 files changed, 24 insertions, 1 deletions
diff --git a/lib/functions.zsh b/lib/functions.zsh index 17f5f9cbf..0d632a268 100644 --- a/lib/functions.zsh +++ b/lib/functions.zsh @@ -15,6 +15,22 @@ function take() { cd $1 } +function open_command() { + local open_cmd + + # define the open command + case "$OSTYPE" in + darwin*) open_cmd="open" ;; + cygwin*) open_cmd="cygstart" ;; + linux*) open_cmd="xdg-open" ;; + *) echo "Platform $OSTYPE not supported" + return 1 + ;; + esac + + nohup $open_cmd "$@" &>/dev/null +} + # # Get the value of an alias. # diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh index e1c2e2f93..babbaa957 100644 --- a/lib/termsupport.zsh +++ b/lib/termsupport.zsh @@ -7,6 +7,9 @@ # (In screen, only short_tab_title is used) # Limited support for Apple Terminal (Terminal can't set window and tab separately) function title { + emulate -L zsh + setopt prompt_subst + [[ "$EMACS" == *term* ]] && return # if $2 is unset use $1 as default @@ -23,6 +26,10 @@ function title { ZSH_THEME_TERM_TAB_TITLE_IDLE="%15<..<%~%<<" #15 char left truncated PWD ZSH_THEME_TERM_TITLE_IDLE="%n@%m: %~" +# Avoid duplication of directory in terminals with independent dir display +if [[ $TERM_PROGRAM == Apple_Terminal ]]; then + ZSH_THEME_TERM_TITLE_IDLE="%n@%m" +fi # Runs before showing the prompt function omz_termsupport_precmd { @@ -43,7 +50,7 @@ function omz_termsupport_preexec { setopt extended_glob # cmd name only, or if this is sudo or ssh, the next cmd - local CMD=${1[(wr)^(*=*|sudo|ssh|rake|-*)]:gs/%/%%} + local CMD=${1[(wr)^(*=*|sudo|ssh|mosh|rake|-*)]:gs/%/%%} local LINE="${2:gs/%/%%}" title '$CMD' '%100>...>$LINE%<<' |