Unsufix internal functions
This commit is contained in:
parent
9f60ddb96b
commit
d19c349f3f
@ -25,7 +25,7 @@ function set-tab-title {
|
|||||||
}
|
}
|
||||||
|
|
||||||
# Sets the tab and window titles with a given command.
|
# Sets the tab and window titles with a given command.
|
||||||
function _terminal-set-titles-with-command-preexec {
|
function _terminal-set-titles-with-command {
|
||||||
emulate -L zsh
|
emulate -L zsh
|
||||||
setopt EXTENDED_GLOB
|
setopt EXTENDED_GLOB
|
||||||
|
|
||||||
@ -41,7 +41,7 @@ function _terminal-set-titles-with-command-preexec {
|
|||||||
jobs "$job_name" 2>/dev/null > >(
|
jobs "$job_name" 2>/dev/null > >(
|
||||||
read index discarded
|
read index discarded
|
||||||
# The index is already surrounded by brackets: [1].
|
# The index is already surrounded by brackets: [1].
|
||||||
set-titles-with-command "${(e):-\$jobtexts_from_parent_shell$index}"
|
_terminal-set-titles-with-command "${(e):-\$jobtexts_from_parent_shell$index}"
|
||||||
)
|
)
|
||||||
else
|
else
|
||||||
# Set the command name, or in the case of sudo or ssh, the next command.
|
# Set the command name, or in the case of sudo or ssh, the next command.
|
||||||
@ -55,7 +55,7 @@ function _terminal-set-titles-with-command-preexec {
|
|||||||
}
|
}
|
||||||
|
|
||||||
# Sets the tab and window titles with a given path.
|
# Sets the tab and window titles with a given path.
|
||||||
function _terminal-set-titles-with-path-precmd {
|
function _terminal-set-titles-with-path {
|
||||||
emulate -L zsh
|
emulate -L zsh
|
||||||
setopt EXTENDED_GLOB
|
setopt EXTENDED_GLOB
|
||||||
|
|
||||||
@ -69,7 +69,7 @@ function _terminal-set-titles-with-path-precmd {
|
|||||||
}
|
}
|
||||||
|
|
||||||
# Sets the Terminal.app proxy icon.
|
# Sets the Terminal.app proxy icon.
|
||||||
function _terminal-set-terminal-app-proxy-icon-precmd {
|
function _terminal-set-terminal-app-proxy-icon {
|
||||||
printf '\e]7;%s\a' "file://$HOST${${1:-$PWD}// /%20}"
|
printf '\e]7;%s\a' "file://$HOST${${1:-$PWD}// /%20}"
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -82,18 +82,18 @@ if [[ "$TERM_PROGRAM" == 'Apple_Terminal' ]] \
|
|||||||
then
|
then
|
||||||
# Sets the Terminal.app current working directory before the prompt is
|
# Sets the Terminal.app current working directory before the prompt is
|
||||||
# displayed.
|
# displayed.
|
||||||
add-zsh-hook precmd _terminal-set-terminal-app-proxy-icon-precmd
|
add-zsh-hook precmd _terminal-set-terminal-app-proxy-icon
|
||||||
|
|
||||||
# Unsets the Terminal.app current working directory when a terminal
|
# Unsets the Terminal.app current working directory when a terminal
|
||||||
# multiplexer or remote connection is started since it can no longer be
|
# multiplexer or remote connection is started since it can no longer be
|
||||||
# updated, and it becomes confusing when the directory displayed in the title
|
# updated, and it becomes confusing when the directory displayed in the title
|
||||||
# bar is no longer synchronized with real current working directory.
|
# bar is no longer synchronized with real current working directory.
|
||||||
function _terminal-unset-terminal-app-proxy-icon-preexec {
|
function _terminal-unset-terminal-app-proxy-icon {
|
||||||
if [[ "${2[(w)1]:t}" == (screen|tmux|dvtm|ssh|mosh) ]]; then
|
if [[ "${2[(w)1]:t}" == (screen|tmux|dvtm|ssh|mosh) ]]; then
|
||||||
_terminal-set-terminal-app-proxy-icon-precmd ' '
|
_terminal-set-terminal-app-proxy-icon ' '
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
add-zsh-hook preexec _terminal-unset-terminal-app-proxy-icon-preexec
|
add-zsh-hook preexec _terminal-unset-terminal-app-proxy-icon
|
||||||
|
|
||||||
# Do not set the tab and window titles in Terminal.app since it sets the tab
|
# Do not set the tab and window titles in Terminal.app since it sets the tab
|
||||||
# title to the currently running process by default and the current working
|
# title to the currently running process by default and the current working
|
||||||
@ -106,9 +106,9 @@ if zstyle -t ':prezto:module:terminal' auto-title \
|
|||||||
&& ( ! [[ -n "$STY" || -n "$TMUX" ]] )
|
&& ( ! [[ -n "$STY" || -n "$TMUX" ]] )
|
||||||
then
|
then
|
||||||
# Sets the tab and window titles before the prompt is displayed.
|
# Sets the tab and window titles before the prompt is displayed.
|
||||||
add-zsh-hook precmd _terminal-set-titles-with-path-precmd
|
add-zsh-hook precmd _terminal-set-titles-with-path
|
||||||
|
|
||||||
# Sets the tab and window titles before command execution.
|
# Sets the tab and window titles before command execution.
|
||||||
add-zsh-hook preexec _terminal-set-titles-with-command-preexec
|
add-zsh-hook preexec _terminal-set-titles-with-command
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user