Minor tweaks

darcs-hash:20050920235718-ac50b-a6e0fc1960a8172415fb8a5ebcce81f921d87b10.gz
This commit is contained in:
axel 2005-09-21 09:57:18 +10:00
parent e3ce01d685
commit 4c9903cd66
2 changed files with 14 additions and 10 deletions

View file

@ -6,7 +6,7 @@
\subsection function-description Description \subsection function-description Description
- <tt>-d DESCRIPTION</tt> or \c --description=DESCRIPTION is a description of what the function does, suitable as a completion description - <tt>-d DESCRIPTION</tt> or \c --description=DESCRIPTION is a description of what the function does, suitable as a completion description
- \c -b or \c --key-binding specifies that the function is a key biding. Key binding functions work exactly like regular functions except that they can not be tab-completed, and may contain the '-' character. - \c -b or \c --key-binding specifies that the function is a key biding. Key binding functions work exactly like regular functions except that they can not be tab-completed, and may contain the '-' character.
This builtin command is used to create a new function. A Function is a This builtin command is used to create a new function. A Function is a
list of commands that will be executed when the name of the function list of commands that will be executed when the name of the function
@ -16,7 +16,7 @@ is entered. The function
function hi function hi
echo hello echo hello
end end
BB</pre> </pre>
will write <tt>hello</tt> whenever the user enters \c hi. will write <tt>hello</tt> whenever the user enters \c hi.
@ -30,7 +30,7 @@ are inserted into the environment variable <a href="index.html#variables-arrays"
</pre> </pre>
will run the \c ls command, using the \c -l option, while passing on any additional files and switches to \c ls. will run the \c ls command, using the \c -l option, while passing on any additional files and switches to \c ls.
A
<pre> <pre>
function mkdir -d "Create a directory and set CWD" function mkdir -d "Create a directory and set CWD"
mkdir $argv mkdir $argv

View file

@ -28,8 +28,8 @@ function contains -d "Test if a key is contained in a set of values"
case '-*' case '-*'
echo Unknown option $argv[$i] echo Unknown option $argv[$i]
_contains_help _contains_help
return 1 return 1
case '*' case '*'
# End the loop, we found the key # End the loop, we found the key
@ -258,10 +258,10 @@ function vared -d "Edit variable value"
read -p $prompt -c $init tmp read -p $prompt -c $init tmp
# If variable already exists, do not add any # If variable already exists, do not add any
# switches, so we don't change export rules. But # switches, so we don't change export rules. But
# if it does not exist, we make the variable # if it does not exist, we make the variable
# global, so that it will not die when this # global, so that it will not die when this
# function dies # function dies
if test $$argv if test $$argv
set -- $argv $tmp set -- $argv $tmp
@ -658,6 +658,9 @@ function type -d "Print the type of a command"
return $status return $status
end end
if status --is-interactive
function prevd-or-backward-word --key-binding function prevd-or-backward-word --key-binding
if test -z (commandline) if test -z (commandline)
prevd prevd
@ -681,7 +684,7 @@ end
# fish-users. # fish-users.
# #
function delete-or-exit --key-binding -d "Exit the shell if the commandline is empty, delete a character otherwise" function delete-or-exit --key-binding
if test (commandline) if test (commandline)
commandline -f delete-char commandline -f delete-char
else else
@ -689,3 +692,4 @@ function delete-or-exit --key-binding -d "Exit the shell if the commandline is e
end end
end end
end