[Bash-completion-commits] [SCM] bash-completion branch, master, updated. fc2c8a5a8e7030c5cd58bb2c67c55b7e875e2205

[Ville Skyttä]

The following commit has been merged in the master branch:
commit fc2c8a5a8e7030c5cd58bb2c67c55b7e875e2205
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Tue Apr 14 23:35:33 2009 +0300

    Use _split_longopt to improve and clean up aspell completion.

diff --git a/CHANGES b/CHANGES
index c424bd7..bfc9c4e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -34,6 +34,7 @@ bash-completion (1.x)
     input in external command arguments.
   * Add _split_longopt() helper for improved handling of long options that
     take arguments in both "--foo bar" and "--foo=bar" formats.
+  * Use _split_longopt to improve and clean up aspell completion.
 
   [ Todd Zullinger ]
   * Make yum complete on filenames after install, deplist, update and upgrade
diff --git a/bash_completion b/bash_completion
index 07827fb..7e02cd0 100644
--- a/bash_completion
+++ b/bash_completion
@@ -6824,82 +6824,69 @@ _aspell_dictionary()
 
 _aspell()
 {
-	local cur prev
+	local cur prev split=false
 
 	COMPREPLY=()
 	cur=`_get_cword`
 	prev=${COMP_WORDS[COMP_CWORD-1]}
 
-	# --name value style option
+	_split_longopt && split=true
+
 	case "$prev" in
-		@(-c|-p|check))
+		-c|-p|check|--@(conf|personal|repl|per-conf))
 			_filedir
 			return 0
 			;;
-		@(dump|create|merge))
+		--@(conf-dir|data-dir|dict-dir|home-dir|local-data-dir|prefix))
+			_filedir -d
+			return 0
+			;;
+		dump|create|merge)
 			COMPREPLY=( $( compgen -W 'master personal repl' -- $cur ) )
 			return 0
 			;;
-		-d)
+		--mode)
+			COMPREPLY=( $( compgen -W 'none url email sgml tex' -- $cur ) )
+			return 0
+			;;
+		--sug-mode)
+			COMPREPLY=( $( compgen -W 'ultra fast normal bad-speller' -- $cur ) )
+			return 0
+			;;
+		--keymapping)
+			COMPREPLY=( $( compgen -W 'aspell ispell' -- $cur ) )
+			return 0
+			;;
+		-d|--master)
 			_aspell_dictionary
 			return 0
 			;;
 	esac
 
-	# --name=value style option
-	if [[ "$cur" == *=* ]]; then
-		prev=${cur/=*/}
-		cur=${cur/*=/}
-		case "$prev" in
-			--@(conf|personal|repl|per-conf))
-				_filedir
-				return 0
-				;;
-			--@(conf-dir|data-dir|dict-dir|home-dir|local-data-dir|prefix))
-				_filedir -d
-				return 0
-				;;
-			--master)
-				_aspell_dictionary
-				return 0
-				;;
-			--mode)
-				COMPREPLY=( $( compgen -W 'none url email sgml tex' -- $cur ) )
-				return 0
-				;;
-			--sug-mode)
-				COMPREPLY=( $( compgen -W 'ultra fast normal bad-speller' -- $cur ) )
-				return 0
-				;;
-			--keymapping)
-				COMPREPLY=( $( compgen -W 'aspell ispell' -- $cur ) )
-				return 0
-				;;
-		esac
-	fi
+	$split && return 0
 
 	if [[ "$cur" == -* ]]; then
-		COMPREPLY=( $( compgen -W '--conf= --conf-dir= --data-dir= --dict-dir= \
-			--encoding= --add-filter= --rem-filter= --mode= -e \
-			-H -t --add-extra-dicts= --rem-extra-dicts= \
-			--home-dir= -W --ignore= --ignore-accents \
+		COMPREPLY=( $( compgen -W '--conf --conf-dir --data-dir --dict-dir \
+			--encoding --add-filter --rem-filter --mode -e \
+			-H -t --add-extra-dicts --rem-extra-dicts \
+			--home-dir -W --ignore --ignore-accents \
 			--dont-ignore-accents --ignore-case --dont-ignore-case \
-			--ignore-repl --dont-ignore-repl --jargon= --keyboard= \
-			--lang= --language-tag= --local-data-dir= -d --master= \
-			--module= --add-module-search-order= \
-			--rem-module-search-order= --per-conf= -p --personal= \
-			--prefix= --repl= -C -B --run-together --dont-run-together \
-			--run-together-limit= --run-together-min= --save-repl \
-			--dont-save-repl --set-prefix --dont-set-prefix --size= \
-			--spelling= --strip-accents --dont-strip-accents \
-			--sug-mode= --add-word-list-path= --rem-word-list-path= \
+			--ignore-repl --dont-ignore-repl --jargon --keyboard \
+			--lang --language-tag --local-data-dir -d --master \
+			--module --add-module-search-order \
+			--rem-module-search-order --per-conf -p --personal \
+			--prefix --repl -C -B --run-together --dont-run-together \
+			--run-together-limit --run-together-min --save-repl \
+			--dont-save-repl --set-prefix --dont-set-prefix --size \
+			--spelling --strip-accents --dont-strip-accents \
+			--sug-mode --add-word-list-path --rem-word-list-path \
 			-b -x --backup -b|-x --dont-backup --reverse --dont-reverse \
-			--time --dont-time --keymapping= --add-email-quote= \
-			--rem-email-quote= --email-margin= --add-tex-command= \
-			--rem-tex-command= --tex-check-comments \
-			--dont-tex-check-comments --add-tex-extension= \
-			--rem-tex-extension= --add-sgml-check= --rem-sgml-check= \
-			--add-sgml-extension= --rem-sgml-extension=' -- $cur ) )
+			--time --dont-time --keymapping --add-email-quote \
+			--rem-email-quote --email-margin --add-tex-command \
+			--rem-tex-command --tex-check-comments \
+			--dont-tex-check-comments --add-tex-extension \
+			--rem-tex-extension --add-sgml-check --rem-sgml-check \
+			--add-sgml-extension --rem-sgml-extension' -- $cur ) )
 	else
 		COMPREPLY=( $( compgen -W '-? help -c check -a pipe -l list \
 			config config soundslike filter -v version dump \

-- 
bash-completion