Split bash builtins completions to contrib/bash-builtins

CHANGES

@@ -26,6 +26,7 @@ bash-completion (1.x)
   * Split rpm-related completions to contrib/rpm
   * Split cvs-related completions to contrib/cvs
   * Split man completion to contrib/man
+  * Split bash builtins completions to contrib/bash-builtins
 
   [ Ville Skyttä ]
   * Split yum and yum-arch completion into contrib/yum.

Makefile.am

@@ -9,6 +9,7 @@ bashcomp_DATA = contrib/ant \
 		contrib/aptitude \
 		contrib/aspell \
 		contrib/autorpm \
+		contrib/bash-builtins \
 		contrib/bind-utils \
 		contrib/bitkeeper \
 		contrib/bittorrent \

bash_completion

@@ -623,135 +623,6 @@ _usb_ids()
 		$( compgen -W "$( lsusb | awk '{print $6}')" -- $cur ) )
 }
 
-# start of section containing completion functions for bash built-ins
-
-# bash alias completion
-#
-_alias()
-{
-	local cur
-
-	COMPREPLY=()
-	cur=`_get_cword`
-
-	case "$COMP_LINE" in
-	*[^=])
-		COMPREPLY=( $( compgen -A alias -- $cur ) )
-		;;
-	*=)
-		COMPREPLY=( "$( alias ${cur%=} 2>/dev/null | \
-			     sed -e 's|^alias '$cur'\(.*\)$|\1|' )" )
-		;;
-	esac
-}
-complete -F _alias $nospace alias
-
-# bash export completion
-#
-_export()
-{
-	local cur
-
-	COMPREPLY=()
-	cur=`_get_cword`
-
-	case "$COMP_LINE" in
-	*=\$*)
-		COMPREPLY=( $( compgen -v -P '$' -- ${cur#*=\$} ) )
-		;;
-	*[^=])
-		COMPREPLY=( $( compgen -v -S '=' -- $cur ) )
-		;;
-	*=)
-		COMPREPLY=( "$( eval echo -n \"$`echo ${cur%=}`\" |
-			( echo -n \'
-			  sed -e 's/'\''/'\''\\\'\'''\''/g'
-			  echo -n \' ) )" )
-		;;
-	esac
-}
-complete -F _export $default $nospace export
-
-# bash shell function completion
-#
-_function()
-{
-	local cur prev
-
-	COMPREPLY=()
-	cur=`_get_cword`
-	prev=${COMP_WORDS[COMP_CWORD-1]}
-
-	if [[ $1 == @(declare|typeset) ]]; then
-		if [ "$prev" = -f ]; then
-			COMPREPLY=( $( compgen -A function -- $cur ) )
-		elif [[ "$cur" == -* ]]; then
-			COMPREPLY=( $( compgen -W '-a -f -F -i -r -x -p' -- \
-				       $cur ) )
-		fi
-	elif [ $COMP_CWORD -eq 1 ]; then
-		COMPREPLY=( $( compgen -A function -- $cur ) )
-	else
-		COMPREPLY=( "() $( type -- ${COMP_WORDS[1]} | sed -e 1,2d )" )
-	fi
-}
-complete -F _function function declare typeset
-
-# bash complete completion
-#
-_complete()
-{
-	local cur prev options
-
-	COMPREPLY=()
-	cur=`_get_cword`
-	prev=${COMP_WORDS[COMP_CWORD-1]}
-
-	case $prev in
-		-o)
-			options="default dirnames filenames"
-			[ -n "$bash205b" ] && options="$options nospace"
-			[ -n "$bash3" ] && options="$options bashdefault plusdirs"
-			COMPREPLY=( $( compgen -W "$options" -- $cur ) )
-			return 0
-			;;
-
-		-A)
-			COMPREPLY=( $( compgen -W 'alias arrayvar binding \
-				builtin command directory disabled enabled \
-				export file function group helptopic hostname \
-				job keyword running service setopt shopt \
-				signal stopped user variable' -- $cur ) )
-			return 0
-			;;
-
-		-C)
-			COMPREPLY=( $( compgen -A command -- $cur ) )
-			return 0
-			;;
-		-F)
-			COMPREPLY=( $( compgen -A function -- $cur ) )
-			return 0
-			;;
-		-@(p|r))
-			COMPREPLY=( $( complete -p | sed -e 's|.* ||' ) )
-			COMPREPLY=( $( compgen -W '${COMPREPLY[@]}' -- $cur ) )
-			return 0
-			;;
-
-	esac
-
-	if [[ "$cur" == -* ]]; then
-		# relevant options completion
-		options="-a -b -c -d -e -f -g -j -k -s -v -u -A -G -W -P -S -X -F -C"
-		[ -n "$bash205" ] && options="$options -o"
-		COMPREPLY=( $( compgen -W "$options" -- $cur ) )
-	else
-		COMPREPLY=( $( compgen -A command -- $cur ) )
-	fi
-}
-complete -F _complete complete
-
 # start of section containing completion functions for external programs
 
 # a little help for FreeBSD ports users

contrib/bash-builtins

@@ -0,0 +1,128 @@
+# start of section containing completion functions for bash built-ins
+
+# bash alias completion
+#
+_alias()
+{
+	local cur
+
+	COMPREPLY=()
+	cur=`_get_cword`
+
+	case "$COMP_LINE" in
+	*[^=])
+		COMPREPLY=( $( compgen -A alias -- $cur ) )
+		;;
+	*=)
+		COMPREPLY=( "$( alias ${cur%=} 2>/dev/null | \
+			     sed -e 's|^alias '$cur'\(.*\)$|\1|' )" )
+		;;
+	esac
+}
+complete -F _alias $nospace alias
+
+# bash export completion
+#
+_export()
+{
+	local cur
+
+	COMPREPLY=()
+	cur=`_get_cword`
+
+	case "$COMP_LINE" in
+	*=\$*)
+		COMPREPLY=( $( compgen -v -P '$' -- ${cur#*=\$} ) )
+		;;
+	*[^=])
+		COMPREPLY=( $( compgen -v -S '=' -- $cur ) )
+		;;
+	*=)
+		COMPREPLY=( "$( eval echo -n \"$`echo ${cur%=}`\" |
+			( echo -n \'
+			  sed -e 's/'\''/'\''\\\'\'''\''/g'
+			  echo -n \' ) )" )
+		;;
+	esac
+}
+complete -F _export $default $nospace export
+
+# bash shell function completion
+#
+_function()
+{
+	local cur prev
+
+	COMPREPLY=()
+	cur=`_get_cword`
+	prev=${COMP_WORDS[COMP_CWORD-1]}
+
+	if [[ $1 == @(declare|typeset) ]]; then
+		if [ "$prev" = -f ]; then
+			COMPREPLY=( $( compgen -A function -- $cur ) )
+		elif [[ "$cur" == -* ]]; then
+			COMPREPLY=( $( compgen -W '-a -f -F -i -r -x -p' -- \
+				       $cur ) )
+		fi
+	elif [ $COMP_CWORD -eq 1 ]; then
+		COMPREPLY=( $( compgen -A function -- $cur ) )
+	else
+		COMPREPLY=( "() $( type -- ${COMP_WORDS[1]} | sed -e 1,2d )" )
+	fi
+}
+complete -F _function function declare typeset
+
+# bash complete completion
+#
+_complete()
+{
+	local cur prev options
+
+	COMPREPLY=()
+	cur=`_get_cword`
+	prev=${COMP_WORDS[COMP_CWORD-1]}
+
+	case $prev in
+		-o)
+			options="default dirnames filenames"
+			[ -n "$bash205b" ] && options="$options nospace"
+			[ -n "$bash3" ] && options="$options bashdefault plusdirs"
+			COMPREPLY=( $( compgen -W "$options" -- $cur ) )
+			return 0
+			;;
+
+		-A)
+			COMPREPLY=( $( compgen -W 'alias arrayvar binding \
+				builtin command directory disabled enabled \
+				export file function group helptopic hostname \
+				job keyword running service setopt shopt \
+				signal stopped user variable' -- $cur ) )
+			return 0
+			;;
+
+		-C)
+			COMPREPLY=( $( compgen -A command -- $cur ) )
+			return 0
+			;;
+		-F)
+			COMPREPLY=( $( compgen -A function -- $cur ) )
+			return 0
+			;;
+		-@(p|r))
+			COMPREPLY=( $( complete -p | sed -e 's|.* ||' ) )
+			COMPREPLY=( $( compgen -W '${COMPREPLY[@]}' -- $cur ) )
+			return 0
+			;;
+
+	esac
+
+	if [[ "$cur" == -* ]]; then
+		# relevant options completion
+		options="-a -b -c -d -e -f -g -j -k -s -v -u -A -G -W -P -S -X -F -C"
+		[ -n "$bash205" ] && options="$options -o"
+		COMPREPLY=( $( compgen -W "$options" -- $cur ) )
+	else
+		COMPREPLY=( $( compgen -A command -- $cur ) )
+	fi
+}
+complete -F _complete complete