Merge branch 'apjanke-termsupport-protect-subshell'

Fixes #4565
11 years ago · dfe10af9fa
parent d2e1c71bfb f0981d564a
commit dfe10af9fa
2 changed files with 2 additions and 2 deletions
--- 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
 #
--- 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