diff options
| author | Marc Cornellà <marc.cornella@live.com> | 2015-11-27 15:59:59 +0100 |
|---|---|---|
| committer | Marc Cornellà <marc.cornella@live.com> | 2015-11-27 15:59:59 +0100 |
| commit | dfe10af9fa853842426581f8b19c1dc85d455b83 (patch) | |
| tree | 069b7aec24f9070a07f7a273d7aff7d504f6aa86 | |
| parent | d2e1c71bfbb24fa6059b75d80c060c9c6b4851fb (diff) | |
| parent | f0981d564a5f9705cb87c00d746ab73ce7f2ec33 (diff) | |
| download | zsh-dfe10af9fa853842426581f8b19c1dc85d455b83.tar.gz zsh-dfe10af9fa853842426581f8b19c1dc85d455b83.tar.bz2 zsh-dfe10af9fa853842426581f8b19c1dc85d455b83.zip | |
Merge branch 'apjanke-termsupport-protect-subshell'
Fixes #4565
| -rw-r--r-- | lib/functions.zsh | 2 | ||||
| -rw-r--r-- | lib/termsupport.zsh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/functions.zsh b/lib/functions.zsh index a25855953..8ef3420bb 100644 --- a/lib/functions.zsh +++ b/lib/functions.zsh @@ -114,7 +114,7 @@ zmodload zsh/langinfo # Returns nonzero if encoding failed. # # Usage: -# omz_urlencode [-r] [-m] <string> +# omz_urlencode [-r] [-m] [-P] <string> # # -r causes reserved characters (;/?:@&=+$,) to be escaped # diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh index 5f61fe8ef..4c5068e9b 100644 --- a/lib/termsupport.zsh +++ b/lib/termsupport.zsh @@ -74,7 +74,7 @@ if [[ "$TERM_PROGRAM" == "Apple_Terminal" ]] && [[ -z "$INSIDE_EMACS" ]]; then # the host name to disambiguate local vs. remote paths. # Percent-encode the pathname. - local URL_PATH=$(omz_urlencode -P $PWD) + local URL_PATH="$(omz_urlencode -P $PWD)" [[ $? != 0 ]] && return 1 local PWD_URL="file://$HOST$URL_PATH" # Undocumented Terminal.app-specific control sequence |