adphi/oh-my-zsh
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add defensive emulate -L zsh to termsupport functions

Browse Source
This commit is contained in:
Andrew Janke 2015-08-17 20:55:41 -04:00
parent 96c34cebae
commit 47d19cc564
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/termsupport.zsh
View File

@ -7,6 +7,7 @@
# (In screen, only short_tab_title is used) # (In screen, only short_tab_title is used)
# Limited support for Apple Terminal (Terminal can't set window and tab separately) # Limited support for Apple Terminal (Terminal can't set window and tab separately)
function title { function title {
emulate -L zsh
[[ "$EMACS" == *term* ]] && return [[ "$EMACS" == *term* ]] && return
# if $2 is unset use $1 as default # if $2 is unset use $1 as default
@ -26,6 +27,7 @@ ZSH_THEME_TERM_TITLE_IDLE="%n@%m: %~"
# Runs before showing the prompt # Runs before showing the prompt
function omz_termsupport_precmd { function omz_termsupport_precmd {
emulate -L zsh
if [[ $DISABLE_AUTO_TITLE == true ]]; then if [[ $DISABLE_AUTO_TITLE == true ]]; then
return return
fi fi
@ -35,11 +37,11 @@ function omz_termsupport_precmd {
# Runs before executing the command # Runs before executing the command
function omz_termsupport_preexec { function omz_termsupport_preexec {
emulate -L zsh
if [[ $DISABLE_AUTO_TITLE == true ]]; then if [[ $DISABLE_AUTO_TITLE == true ]]; then
return return
fi fi
emulate -L zsh
setopt extended_glob setopt extended_glob
# cmd name only, or if this is sudo or ssh, the next cmd # cmd name only, or if this is sudo or ssh, the next cmd
@ -61,6 +63,7 @@ if [[ "$TERM_PROGRAM" == "Apple_Terminal" ]] && [[ -z "$INSIDE_EMACS" ]]; then
# Emits the control sequence to notify Terminal.app of the cwd # Emits the control sequence to notify Terminal.app of the cwd
function update_terminalapp_cwd() { function update_terminalapp_cwd() {
emulate -L zsh
# Identify the directory using a "file:" scheme URL, including # Identify the directory using a "file:" scheme URL, including
# the host name to disambiguate local vs. remote paths. # the host name to disambiguate local vs. remote paths.