linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-11-26 21:51:05 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'apjanke-termsupport-protect-subshell'

Browse source 
Fixes #4565
This commit is contained in:
Marc Cornellà 2015-11-27 15:59:59 +01:00
commit dfe10af9fa
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/functions.zsh
View file

@ -114,7 +114,7 @@ zmodload zsh/langinfo
# Returns nonzero if encoding failed. # Returns nonzero if encoding failed.
# #
# Usage: # Usage:
# omz_urlencode [-r] [-m] <string> # omz_urlencode [-r] [-m] [-P] <string>
# #
# -r causes reserved characters (;/?:@&=+$,) to be escaped # -r causes reserved characters (;/?:@&=+$,) to be escaped
# #

2
lib/termsupport.zsh
View file

@ -74,7 +74,7 @@ if [[ "$TERM_PROGRAM" == "Apple_Terminal" ]] && [[ -z "$INSIDE_EMACS" ]]; then
# the host name to disambiguate local vs. remote paths. # the host name to disambiguate local vs. remote paths.
# Percent-encode the pathname. # Percent-encode the pathname.
local URL_PATH=$(omz_urlencode -P $PWD) local URL_PATH="$(omz_urlencode -P $PWD)"
[[ $? != 0 ]] && return 1 [[ $? != 0 ]] && return 1
local PWD_URL="file://$HOST$URL_PATH" local PWD_URL="file://$HOST$URL_PATH"
# Undocumented Terminal.app-specific control sequence # Undocumented Terminal.app-specific control sequence