h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-09 03:51:20 -03:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'refs/merge-requests/6' of git://gitorious.org/fish-shell/fish-shell into merge_req_6

Browse Source
This commit is contained in:
Christopher Nilsson
2010-11-24 22:34:29 +11:00
parent 1b0ce33669 4f9b07e979
commit dcecab384a
10 changed files with 41 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
share/functions/__fish_config_interactive.fish
View File

@@ -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

2
share/functions/eval.fish
View File

@@ -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

2
share/functions/help.fish
View File

@@ -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"