summaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
authorLangLangBart <92653266+LangLangBart@users.noreply.github.com>2023-10-14 10:41:01 +0200
committerGitHub <noreply@github.com>2023-10-14 17:41:01 +0900
commit3e1735b06eb458525b496645dd6cc9ffc606f61d (patch)
treec2eddcac1d8c45ae5c1aa9fce919b2ebf05dac51 /shell
parentde7ef7eacedc152bdbd78ab13db797dfe8a4b6ed (diff)
[zsh] Fix 'emulate: unknown argument -o' error on old zsh (#3465)
Fix #2094
Diffstat (limited to 'shell')
-rw-r--r--shell/completion.zsh2
-rw-r--r--shell/key-bindings.zsh2
2 files changed, 2 insertions, 2 deletions
diff --git a/shell/completion.zsh b/shell/completion.zsh
index d5ef40bc..c01bbb82 100644
--- a/shell/completion.zsh
+++ b/shell/completion.zsh
@@ -70,7 +70,7 @@ fi
# control. There are several others that could wreck havoc if they are set
# to values we don't expect. With the following `emulate` command we
# sidestep this issue entirely.
-'emulate' 'zsh' '-o' 'no_aliases'
+'builtin' 'emulate' 'zsh' && 'builtin' 'setopt' 'no_aliases'
# This brace is the start of try-always block. The `always` part is like
# `finally` in lesser languages. We use it to *always* restore user options.
diff --git a/shell/key-bindings.zsh b/shell/key-bindings.zsh
index 4c4f0a08..b64f7916 100644
--- a/shell/key-bindings.zsh
+++ b/shell/key-bindings.zsh
@@ -35,7 +35,7 @@ else
}
fi
-'emulate' 'zsh' '-o' 'no_aliases'
+'builtin' 'emulate' 'zsh' && 'builtin' 'setopt' 'no_aliases'
{