[zsh] Fix 'emulate: unknown argument -o' error on old zsh (#3465)

Fix #2094
junegunn · Oct 14, 2023 · 3e1735b · 3e1735b
1 parent de7ef7e
commit 3e1735b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -35,7 +35,7 @@ else
   }
 fi
 
-'emulate' 'zsh' '-o' 'no_aliases'
+'builtin' 'emulate' 'zsh' && 'builtin' 'setopt' 'no_aliases'
 
 {
-Original file line number
+Diff line change
@@ Expand Up / @@ -35,7 +35,7 @@ else @@
       }
     fi
-    'emulate' 'zsh' '-o' 'no_aliases'
+    'builtin' 'emulate' 'zsh' && 'builtin' 'setopt' 'no_aliases'
     {
@@ Expand Down @@