diff --git a/doc_src/function.txt b/doc_src/function.txt
index a8dba06f0..4eb555c92 100644
--- a/doc_src/function.txt
+++ b/doc_src/function.txt
@@ -6,7 +6,7 @@
 \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
-- \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
 list of commands that will be executed when the name of the function
@@ -16,7 +16,7 @@ is entered. The function
 function hi
 	echo hello
 end
-BB</pre> 
+</pre> 
 
 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>
 
 will run the \c ls command, using the \c -l option, while passing on any additional files and switches to \c ls.
-A
+
 <pre>
 function mkdir -d "Create a directory and set CWD"
 	mkdir $argv
diff --git a/init/fish_function.fish b/init/fish_function.fish
index d73af23cb..bbed4e1c8 100644
--- a/init/fish_function.fish
+++ b/init/fish_function.fish
@@ -28,8 +28,8 @@ function contains -d "Test if a key is contained in a set of values"
 			
 			case '-*'
 				echo Unknown option $argv[$i]
-                _contains_help
-                return 1
+				_contains_help
+				return 1
 
 			case '*'
 				# End the loop, we found the key
@@ -258,10 +258,10 @@ function vared -d "Edit variable value"
 					read -p $prompt -c $init tmp
 
 					# If variable already exists, do not add any
-                    # switches, so we don't change export rules. But
-                    # if it does not exist, we make the variable
-                    # global, so that it will not die when this
-                    # function dies
+					# switches, so we don't change export rules. But
+					# if it does not exist, we make the variable
+					# global, so that it will not die when this
+					# function dies
 
 					if test $$argv
 						set -- $argv $tmp
@@ -658,6 +658,9 @@ function type -d "Print the type of a command"
 	return $status
 end
 
+
+if status --is-interactive
+
 function prevd-or-backward-word --key-binding 
 	if test -z (commandline)
 		prevd
@@ -681,7 +684,7 @@ end
 # 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)
 		commandline -f delete-char
 	else
@@ -689,3 +692,4 @@ function delete-or-exit --key-binding -d "Exit the shell if the commandline is e
 	end
 end
 
+end