diff options
Diffstat (limited to 'share')
| -rw-r--r-- | share/functions/__fish_config_interactive.fish | 2 | ||||
| -rw-r--r-- | share/functions/eval.fish | 2 | ||||
| -rw-r--r-- | share/functions/help.fish | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/share/functions/__fish_config_interactive.fish b/share/functions/__fish_config_interactive.fish index e2ace3f0..7ec8215e 100644 --- a/share/functions/__fish_config_interactive.fish +++ b/share/functions/__fish_config_interactive.fish @@ -150,7 +150,7 @@ function __fish_config_interactive -d "Initializations that should be performed fish_greeting else if set -q fish_greeting - switch $fish_greeting + switch "$fish_greeting" case '' # If variable is empty, don't print anything, saves us a fork diff --git a/share/functions/eval.fish b/share/functions/eval.fish index 34c4e3aa..aec8de27 100644 --- a/share/functions/eval.fish +++ b/share/functions/eval.fish @@ -21,6 +21,8 @@ function eval -S -d "Evaluate parameters as a command" end echo begin\; $argv \;end eval2_inner \<\&3 3\<\&- | . 3<&0 + set -l res $status status --job-control $mode + return $res end diff --git a/share/functions/help.fish b/share/functions/help.fish index bd536002..9531c103 100644 --- a/share/functions/help.fish +++ b/share/functions/help.fish @@ -86,7 +86,7 @@ function help --description "Show help for the fish shell" # documentation. It's a bit of a hack, since it relies on the # Doxygen markup format to never change. - case (sed -n < $__fish_help_dir/commands.html -e "s/.*<h2><a class=\"anchor\" name=\"\([^\"]*\)\">.*/\1/p") + case (sed -n 's/.*<h2><a class="anchor" \(id\|name\)="\([^"]*\)">.*/\2/p' $__fish_help_dir/commands.html) set fish_help_page "commands.html\#$fish_help_item" case $help_topics set fish_help_page "index.html\#$fish_help_item" |