diff --git a/share/completions/read.fish b/share/completions/read.fish
index 3dfe09d32..85b3a7437 100644
--- a/share/completions/read.fish
+++ b/share/completions/read.fish
@@ -5,6 +5,7 @@ complete -c read -s P -l prompt-str -d "Set prompt using provided string" -x
 complete -c read -s x -l export -d "Export variable to subprocess"
 complete -c read -s g -l global -d "Make variable scope global"
 complete -c read -s l -l local -d "Make variable scope local"
+complete -c read -s f -l function -d "Make variable function-scoped"
 complete -c read -s U -l universal -d "Share variable with all the users fish processes on the computer"
 complete -c read -s u -l unexport -d "Do not export variable to subprocess"
 complete -c read -s c -l command -d "Initial contents of read buffer when reading interactively" -r
diff --git a/share/completions/set.fish b/share/completions/set.fish
index bf13908df..a7d88d92a 100644
--- a/share/completions/set.fish
+++ b/share/completions/set.fish
@@ -89,6 +89,7 @@ complete -c set -n "__fish_is_nth_token 1" -s p -l prepend -d "Prepend value to
 complete -c set -n "__fish_is_nth_token 1" -s S -l show -d "Show variable"
 complete -c set -n "__fish_is_nth_token 1" -l path -d "Make variable as a path variable"
 complete -c set -n "__fish_is_nth_token 1" -l unpath -d "Make variable not as a path variable"
+complete -c set -n "__fish_is_nth_token 1" -l no-event -d "Don't emit an event"
 
 #TODO: add CPP code to generate list of read-only variables and exclude them from the following completions
 
diff --git a/share/completions/type.fish b/share/completions/type.fish
index 8e041ef38..9e5fb976c 100644
--- a/share/completions/type.fish
+++ b/share/completions/type.fish
@@ -5,6 +5,7 @@ complete -c type -s t -l type -d "Print command type"
 complete -c type -s p -l path -d "Print path to command, or nothing if name is not a command"
 complete -c type -s P -l force-path -d "Print path to command"
 complete -c type -s q -l query -l quiet -d "Check if something exists without output"
+complete -c type -s s -l short -d "Don't print function definition"
 
 complete -c type -a "(builtin -n)" -d Builtin
 complete -c type -a "(functions -n)" -d Function