Simplify completions for a few commands (svn, cvs, darcs, yum)

darcs-hash:20070120170940-ac50b-24c0e5b05ca03a590b90e795bbd62b15583e2bd1.gz

4 files changed, 113 insertions, 128 deletions

diff --git a/share/completions/cvs.fish b/share/completions/cvs.fish
index 771affaf..03ff8b12 100644
--- a/share/completions/cvs.fish
+++ b/share/completions/cvs.fish
@@ -20,43 +20,43 @@ end
 # If no subcommand has been specified, complete using all available subcommands
 #
 
-complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'add\t"'(_ "Add a new file/directory to the repository")'"'
-complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'admin\t"'(_ "Administration front end for rcs")'"'
-complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'annotate\t"'(_ "Show last revision where each line was modified")'"'
-complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'checkout\t"'(_ "Checkout sources for editing")'"'
-complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'commit\t"'(_ "Check files into the repository")'"'
-complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'diff\t"'(_ "Show differences between revisions")'"'
-complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'edit\t"'(_ "Get ready to edit a watched file")'"'
-complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'editors\t"'(_ "See who is editing a watched file")'"'
-complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'export\t"'(_ "Export sources from CVS, similar to checkout")'"'
-complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'history\t"'(_ "Show repository access history")'"'
-complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'import\t"'(_ "Import sources into CVS, using vendor branches")'"'
-complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'init\t"'(_ "Create a CVS repository if it doesnt exist")'"'
-complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'kserver\t"'(_ "Kerberos server mode")'"'
-complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'log\t"'(_ "Print out history information for files")'"'
-complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'login\t"'(_ "Prompt for password for authenticating server")'"'
-complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'logout\t"'(_ "Removes entry in .cvspass for remote repository")'"'
-complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'pserver\t"'(_ "Password server mode")'"'
-complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'rannotate\t"'(_ "Show last revision where each line of module was modified")'"'
-complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'rdiff\t"'(_ "Create "patch" format diffs between releases")'"'
-complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'release\t"'(_ "Indicate that a Module is no longer in use")'"'
-complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'remove\t"'(_ "Remove an entry from the repository")'"'
-complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'rlog\t"'(_ "Print out history information for a module")'"'
-complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'rtag\t"'(_ "Add a symbolic tag to a module")'"'
-complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'server\t"'(_ "Server mode")'"'
-complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'status\t"'(_ "Display status information on checked out files")'"'
-complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'tag\t"'(_ "Add a symbolic tag to checked out version of files")'"'
-complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'unedit\t"'(_ "Undo an edit command")'"'
-complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'update\t"'(_ "Bring work tree in sync with repository")'"'
-complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'version\t"'(_ "Display version and exit")'"'
-complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'watch\t"'(_ "Set watches")'"'
-complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'watchers\t"'(_ "See who is watching a file")'"'
+complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'add' --description "Add a new file/directory to the repository"
+complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'admin' --description "Administration front end for rcs"
+complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'annotate' --description "Show last revision where each line was modified"
+complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'checkout' --description "Checkout sources for editing"
+complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'commit' --description "Check files into the repository"
+complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'diff' --description "Show differences between revisions"
+complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'edit' --description "Get ready to edit a watched file"
+complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'editors' --description "See who is editing a watched file"
+complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'export' --description "Export sources from CVS, similar to checkout"
+complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'history' --description "Show repository access history"
+complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'import' --description "Import sources into CVS, using vendor branches"
+complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'init' --description "Create a CVS repository if it doesnt exist"
+complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'kserver' --description "Kerberos server mode"
+complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'log' --description "Print out history information for files"
+complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'login' --description "Prompt for password for authenticating server"
+complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'logout' --description "Removes entry in .cvspass for remote repository"
+complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'pserver' --description "Password server mode"
+complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'rannotate' --description "Show last revision where each line of module was modified"
+complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'rdiff' --description "Create "patch" format diffs between releases"
+complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'release' --description "Indicate that a Module is no longer in use"
+complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'remove' --description "Remove an entry from the repository"
+complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'rlog' --description "Print out history information for a module"
+complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'rtag' --description "Add a symbolic tag to a module"
+complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'server' --description "Server mode"
+complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'status' --description "Display status information on checked out files"
+complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'tag' --description "Add a symbolic tag to checked out version of files"
+complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'unedit' --description "Undo an edit command"
+complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'update' --description "Bring work tree in sync with repository"
+complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'version' --description "Display version and exit"
+complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'watch' --description "Set watches"
+complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'watchers' --description "See who is watching a file"
 
 #
 # cvs_options switches, which must be specified before a command.
 # 
 
-complete -c cvs -n '__fish_no_cvs_subcommand' -x -l allow-root -d (N_ "Specify legal cvsroot directory." )
+complete -c cvs -n '__fish_no_cvs_subcommand' -x -l allow-root --description "Specify legal cvsroot directory."
 complete -c cvs -n '__fish_no_cvs_subcommand' -s a --description "Authenticate all net traffic"
 complete -c cvs -n '__fish_no_cvs_subcommand' -r -s T --description "Use "tmpdir" for temporary files"
 complete -c cvs -n '__fish_no_cvs_subcommand' -x -s d --description "Overrides $CVSROOT as the root of the CVS tree"
diff --git a/share/completions/darcs.fish b/share/completions/darcs.fish
index 39f79b81..06387958 100644
--- a/share/completions/darcs.fish
+++ b/share/completions/darcs.fish
@@ -8,35 +8,35 @@
 # If no subcommand has been specified, complete using all available subcommands
 #
 
-complete -c darcs -n '__fish_use_subcommand' -xa 'initialize\t"'(_ "Create new project")'"'
-complete -c darcs -n '__fish_use_subcommand' -xa 'get\t"'(_ "Create a local copy of another repository")'"'
-complete -c darcs -n '__fish_use_subcommand' -xa 'add\t"'(_ "Add one or more new files or directories")'"'
-complete -c darcs -n '__fish_use_subcommand' -xa 'remove\t"'(_ "Remove one or more files or directories from the repository")'"'
-complete -c darcs -n '__fish_use_subcommand' -xa 'mv\t"'(_ "Move/rename one or more files or directories")'"'
-complete -c darcs -n '__fish_use_subcommand' -xa 'replace\t"'(_ "Replace a token with a new value for that token")'"'
-complete -c darcs -n '__fish_use_subcommand' -xa 'record\t"'(_ "Save changes in the working copy to the repository as a patch")'"'
-complete -c darcs -n '__fish_use_subcommand' -xa 'pull\t"'(_ "Copy and apply patches from another repository to this one")'"'
-complete -c darcs -n '__fish_use_subcommand' -xa 'send\t"'(_ "Send by email a bundle of one or more patches")'"'
-complete -c darcs -n '__fish_use_subcommand' -xa 'apply\t"'(_ "Apply patches (from an email bundle) to the repository")'"'
-complete -c darcs -n '__fish_use_subcommand' -xa 'push\t"'(_ "Copy and apply patches from this repository to another one")'"'
-complete -c darcs -n '__fish_use_subcommand' -xa 'whatsnew\t"'(_ "Display unrecorded changes in the working copy")'"'
-complete -c darcs -n '__fish_use_subcommand' -xa 'changes\t"'(_ "Gives a changelog style summary of the repo history")'"'
-complete -c darcs -n '__fish_use_subcommand' -xa 'unrecord\t"'(_ "Remove recorded patches without changing the working copy")'"'
-complete -c darcs -n '__fish_use_subcommand' -xa 'amend-record\t"'(_ "Replace a recorded patch with a better version")'"'
-complete -c darcs -n '__fish_use_subcommand' -xa 'revert\t"'(_ "Revert to the recorded version (safe the first time only)" )'"'
-complete -c darcs -n '__fish_use_subcommand' -xa 'unrevert\t"'(_ "Undo the last revert (may fail if changes after the revert)")'"'
-complete -c darcs -n '__fish_use_subcommand' -xa 'unpull\t"'(_ "Opposite of pull; unsafe if the patch is not in remote repo")'"'
-complete -c darcs -n '__fish_use_subcommand' -xa 'rollback\t"'(_ "Record an inverse patch without changing the working copy" )'"'
-complete -c darcs -n '__fish_use_subcommand' -xa 'tag\t"'(_ "Tag the contents of the repository with a version name")'"'
-complete -c darcs -n '__fish_use_subcommand' -xa 'setpref\t"'(_ "Set a value for a preference (test, predist, ...)")'"'
-complete -c darcs -n '__fish_use_subcommand' -xa 'diff\t"'(_ "Create a diff between two versions of the repository")'"'
-complete -c darcs -n '__fish_use_subcommand' -xa 'annotate\t"'(_ "Display which patch last modified something")'"'
-complete -c darcs -n '__fish_use_subcommand' -xa 'optimize\t"'(_ "Optimize the repository")'"'
-complete -c darcs -n '__fish_use_subcommand' -xa 'check\t"'(_ "Check the repository for consistency")'"'
-complete -c darcs -n '__fish_use_subcommand' -xa 'resolve\t"'(_ "Mark any conflicts to the working copy for manual resolution")'"'
-complete -c darcs -n '__fish_use_subcommand' -xa 'dist\t"'(_ "Create a distribution tarball")'"'
-complete -c darcs -n '__fish_use_subcommand' -xa 'trackdown\t"'(_ "Locate the most recent version lacking an error")'"'
-complete -c darcs -n '__fish_use_subcommand' -xa 'repair\t"'(_ "Repair the corrupted repository")'"'
+complete -c darcs -n '__fish_use_subcommand' -xa 'initialize' --description "Create new project"
+complete -c darcs -n '__fish_use_subcommand' -xa 'get' --description "Create a local copy of another repository"
+complete -c darcs -n '__fish_use_subcommand' -xa 'add' --description "Add one or more new files or directories"
+complete -c darcs -n '__fish_use_subcommand' -xa 'remove' --description "Remove one or more files or directories from the repository"
+complete -c darcs -n '__fish_use_subcommand' -xa 'mv' --description "Move/rename one or more files or directories"
+complete -c darcs -n '__fish_use_subcommand' -xa 'replace' --description "Replace a token with a new value for that token"
+complete -c darcs -n '__fish_use_subcommand' -xa 'record' --description "Save changes in the working copy to the repository as a patch"
+complete -c darcs -n '__fish_use_subcommand' -xa 'pull' --description "Copy and apply patches from another repository to this one"
+complete -c darcs -n '__fish_use_subcommand' -xa 'send' --description "Send by email a bundle of one or more patches"
+complete -c darcs -n '__fish_use_subcommand' -xa 'apply' --description "Apply patches (from an email bundle) to the repository"
+complete -c darcs -n '__fish_use_subcommand' -xa 'push' --description "Copy and apply patches from this repository to another one"
+complete -c darcs -n '__fish_use_subcommand' -xa 'whatsnew' --description "Display unrecorded changes in the working copy"
+complete -c darcs -n '__fish_use_subcommand' -xa 'changes' --description "Gives a changelog style summary of the repo history"
+complete -c darcs -n '__fish_use_subcommand' -xa 'unrecord' --description "Remove recorded patches without changing the working copy"
+complete -c darcs -n '__fish_use_subcommand' -xa 'amend-record' --description "Replace a recorded patch with a better version"
+complete -c darcs -n '__fish_use_subcommand' -xa 'revert' --description "Revert to the recorded version (safe the first time only)"
+complete -c darcs -n '__fish_use_subcommand' -xa 'unrevert' --description "Undo the last revert (may fail if changes after the revert)"
+complete -c darcs -n '__fish_use_subcommand' -xa 'unpull' --description "Opposite of pull; unsafe if the patch is not in remote repo"
+complete -c darcs -n '__fish_use_subcommand' -xa 'rollback' --description "Record an inverse patch without changing the working copy"
+complete -c darcs -n '__fish_use_subcommand' -xa 'tag' --description "Tag the contents of the repository with a version name"
+complete -c darcs -n '__fish_use_subcommand' -xa 'setpref' --description "Set a value for a preference (test, predist, ...)"
+complete -c darcs -n '__fish_use_subcommand' -xa 'diff' --description "Create a diff between two versions of the repository"
+complete -c darcs -n '__fish_use_subcommand' -xa 'annotate' --description "Display which patch last modified something"
+complete -c darcs -n '__fish_use_subcommand' -xa 'optimize' --description "Optimize the repository"
+complete -c darcs -n '__fish_use_subcommand' -xa 'check' --description "Check the repository for consistency"
+complete -c darcs -n '__fish_use_subcommand' -xa 'resolve' --description "Mark any conflicts to the working copy for manual resolution"
+complete -c darcs -n '__fish_use_subcommand' -xa 'dist' --description "Create a distribution tarball"
+complete -c darcs -n '__fish_use_subcommand' -xa 'trackdown' --description "Locate the most recent version lacking an error"
+complete -c darcs -n '__fish_use_subcommand' -xa 'repair' --description "Repair the corrupted repository"
  
 #
 # These switches are universal
diff --git a/share/completions/svn.fish b/share/completions/svn.fish
index ae89ed07..2420922d 100644
--- a/share/completions/svn.fish
+++ b/share/completions/svn.fish
@@ -6,32 +6,37 @@
 # If no subcommand has been specified, complete using all available subcommands
 #
 
-complete -c svn -n '__fish_use_subcommand' -xa 'add\t"'(_ "Place files or directories under version control")'"'
-complete -c svn -n '__fish_use_subcommand' -xa 'blame\t"'(_ "Output files/URLs with revision and author information inline")'"'
-complete -c svn -n '__fish_use_subcommand' -xa 'cat\t"'(_ "Output content of files/URLs")'"'
-complete -c svn -n '__fish_use_subcommand' -xa 'checkout\t"'(_ "Check out a working copy from the repository")'"'
-complete -c svn -n '__fish_use_subcommand' -xa 'cleanup\t"'(_ "Recursively clean up the working copy")'"'
-complete -c svn -n '__fish_use_subcommand' -xa 'commit\t"'(_ "Send changes from your working copy to the repository")'"'
-complete -c svn -n '__fish_use_subcommand' -xa 'delete\t"'(_ "Remove file or directory from version control")'"'
-complete -c svn -n '__fish_use_subcommand' -xa 'import\t"'(_ "Commit an unversioned file or tree into the repository")'"'
-complete -c svn -n '__fish_use_subcommand' -xa 'info\t"'(_ "Display information about a local or remote item")'"'
-complete -c svn -n '__fish_use_subcommand' -xa 'list\t"'(_ "List directory entries in the repository")'"'
-complete -c svn -n '__fish_use_subcommand' -xa 'lock\t"'(_ "Lock working copy paths or URLs in the repository")'"'
-complete -c svn -n '__fish_use_subcommand' -xa 'log\t"'(_ "Show the log messages for a set of revision(s) and/or file(s)")'"'
-complete -c svn -n '__fish_use_subcommand' -xa 'merge\t"'(_ "Apply the differences between two sources to a working copy path")'"'
-complete -c svn -n '__fish_use_subcommand' -xa 'mkdir\t"'(_ "Create a new directory under version control")'"'
-complete -c svn -n '__fish_use_subcommand' -xa 'move\t"'(_ "Move and/or rename something in working copy or repository")'"'
-complete -c svn -n '__fish_use_subcommand' -xa 'propdel\t"'(_ "Remove a property from files, dirs, or revisions")'"'
-complete -c svn -n '__fish_use_subcommand' -xa 'propedit\t"'(_ "Edit a property with an external editor on targets")'"'
-complete -c svn -n '__fish_use_subcommand' -xa 'propget\t"'(_ "Print value of a property on files, dirs, or revisions")'"'
-complete -c svn -n '__fish_use_subcommand' -xa 'proplist\t"'(_ "List all properties on files, dirs, or revisions")'"'
-complete -c svn -n '__fish_use_subcommand' -xa 'resolved\t"'(_ "Remove conflicted state on working copy files or directories")'"'
-complete -c svn -n '__fish_use_subcommand' -xa 'revert\t"'(_ "Restore pristine working copy file")'"'
-complete -c svn -n '__fish_use_subcommand' -xa 'status\t"'(_ "Print the status of working copy files and directories")'"'
-complete -c svn -n '__fish_use_subcommand' -xa 'switch\t"'(_ "Update the working copy to a different URL")'"'
-complete -c svn -n '__fish_use_subcommand' -xa 'unlock\t"'(_ "Unlock working copy paths or URLs")'"'
-complete -c svn -n '__fish_use_subcommand' -xa 'update\t"'(_ "Bring changes from the repository into the working copy")'"'
-complete -c svn -n '__fish_use_subcommand' -xa 'help\t"'(_ "Describe the usage of this program or its subcommands")'"'
+complete -c svn -n '__fish_use_subcommand' -xa 'add' --description "Place files or directories under version control"
+complete -c svn -n '__fish_use_subcommand' -xa 'blame praise annotate ann' --description "Output files/URLs with revision and author information inline"
+complete -c svn -n '__fish_use_subcommand' -xa 'cat' --description "Output content of files/URLs"
+complete -c svn -n '__fish_use_subcommand' -xa 'checkout co' --description "Check out a working copy from the repository"
+complete -c svn -n '__fish_use_subcommand' -xa 'cleanup' --description "Recursively clean up the working copy"
+complete -c svn -n '__fish_use_subcommand' -xa 'commit ci' --description "Send changes from your working copy to the repository"
+complete -c svn -n '__fish_use_subcommand' -xa 'copy cp' --description "Duplicate something in working copy or repository, remembering history"
+complete -c svn -n '__fish_use_subcommand' -xa 'delete del remove rm' --description "Remove file or directory from version control"
+complete -c svn -n '__fish_use_subcommand' -xa 'diff di' --description "Display the differences between two paths"
+complete -c svn -n '__fish_use_subcommand' -xa 'export' --description "Create an unversioned copy of a tree"
+complete -c svn -n '__fish_use_subcommand' -xa 'help h \\?' --description "Describe the usage of this program or its subcommands"
+complete -c svn -n '__fish_use_subcommand' -xa 'import' --description "Commit an unversioned file or tree into the repository"
+complete -c svn -n '__fish_use_subcommand' -xa 'info' --description "Display information about a local or remote item"
+complete -c svn -n '__fish_use_subcommand' -xa 'list ls' --description "List directory entries in the repository"
+complete -c svn -n '__fish_use_subcommand' -xa 'lock' --description "Lock working copy paths or URLs in the repository"
+complete -c svn -n '__fish_use_subcommand' -xa 'log' --description "Show the log messages for a set of revision(s) and/or file(s)"
+complete -c svn -n '__fish_use_subcommand' -xa 'merge' --description "Apply the differences between two sources to a working copy path"
+complete -c svn -n '__fish_use_subcommand' -xa 'mkdir' --description "Create a new directory under version control"
+complete -c svn -n '__fish_use_subcommand' -xa 'move mv rename ren' --description "Move and/or rename something in working copy or repository"
+complete -c svn -n '__fish_use_subcommand' -xa 'propdel pdel pd' --description "Remove a property from files, dirs, or revisions"
+complete -c svn -n '__fish_use_subcommand' -xa 'propedit pedit pe' --description "Edit a property with an external editor on targets"
+complete -c svn -n '__fish_use_subcommand' -xa 'propget pget pg' --description "Print value of a property on files, dirs, or revisions"
+complete -c svn -n '__fish_use_subcommand' -xa 'proplist plist pl' --description "List all properties on files, dirs, or revisions"
+complete -c svn -n '__fish_use_subcommand' -xa 'propset pset ps' --description "Set the value of a property on files, dirs, or revisions"
+complete -c svn -n '__fish_use_subcommand' -xa 'resolved' --description "Remove conflicted state on working copy files or directories"
+complete -c svn -n '__fish_use_subcommand' -xa 'revert' --description "Restore pristine working copy file"
+complete -c svn -n '__fish_use_subcommand' -xa 'status stat st' --description "Print the status of working copy files and directories"
+complete -c svn -n '__fish_use_subcommand' -xa 'switch sw' --description "Update the working copy to a different URL"
+complete -c svn -n '__fish_use_subcommand' -xa 'unlock' --description "Unlock working copy paths or URLs"
+complete -c svn -n '__fish_use_subcommand' -xa 'update up' --description "Bring changes from the repository into the working copy"
+
 
 # -s/--revision
 complete -c svn -n '__fish_seen_subcommand_from blame cat checkout info list log merge move propdel propedit propget proplist switch update' -x -s r -l revision --description "Specify revision"
diff --git a/share/completions/yum.fish b/share/completions/yum.fish
index ead30a6a..78dcb587 100644
--- a/share/completions/yum.fish
+++ b/share/completions/yum.fish
@@ -2,20 +2,9 @@
 # Completions for the yum command
 #
 
-#All yum commands
+# All yum commands
 
-#Test if the yum command has been specified
-function __fish_yum_has_command 
-	set modes install update check-update upgrade remove erase list provides whatprovides search info clean generate-rss
-	for i in (commandline -poc);
-		if contains $i $modes
-			return 1
-		end
-	end
-	return 0;
-end
-
-#Test if completing using package names is appropriate
+# Test if completing using package names is appropriate
 function __fish_yum_package_ok
 	for i in (commandline -poc)
 		if contains $i update upgrade remove erase 
@@ -25,21 +14,16 @@ function __fish_yum_package_ok
 	return 1
 end
 
-complete -c yum -n '__fish_yum_has_command' -xa "
-    install\t'Install the latest version of a package'
-    update\t'Update specified packages (defaults to all packages)'
-    check-update\t'Print list of available updates'
-    upgrade\t'Update specified packages including obsoletes (defaults to all packages)'
-    remove\t'remove the specified packages and packages that depend on them'
-	erase\t'remove the specified packages and packages that depend on them'
-	list\t'List information about avaialble packages'
-	provides\t'Find package providing a feature or file'
-	whatprovides\t'Find package providing a feature or file'
-    search\t'find packages matching description regexp'
-    info\t'List information about available packages'
-    clean\t'Clean up cache directory'
-    generate-rss\t'Generate rss changelog'
-"
+complete -c yum -n '__fish_use_subcommand' -xa install --description "Install the latest version of a package"
+complete -c yum -n '__fish_use_subcommand' -xa 'update upgrade' --description "Update specified packages (defaults to all packages)"
+complete -c yum -n '__fish_use_subcommand' -xa check-update --description "Print list of available updates"
+complete -c yum -n '__fish_use_subcommand' -xa 'remove erase' --description "Remove the specified packages and packages that depend on them"
+complete -c yum -n '__fish_use_subcommand' -xa list --description "List avaialble packages"
+complete -c yum -n '__fish_use_subcommand' -xa info --description "Describe avaialble packages"
+complete -c yum -n '__fish_use_subcommand' -xa 'provides whatprovides' --description "Find package providing a feature or file"
+complete -c yum -n '__fish_use_subcommand' -xa search --description "find packages matching description regexp"
+complete -c yum -n '__fish_use_subcommand' -xa clean --description "Clean up cache directory"
+complete -c yum -n '__fish_use_subcommand' -xa generate-rss --description "Generate rss changelog"
 
 complete -c yum -n '__fish_yum_package_ok' -a "(__fish_print_packages)"
 
@@ -59,17 +43,13 @@ complete -c yum -l obsoletes --description "Enables obsolets processing logic"
 complete -c yum -l rss-filename --description "Output rss-data to file" -r 
 complete -c yum -l exclude --description "Exclude specified package from updates" -a "(__fish_print_packages)" 
 
-complete -c yum -n 'contains list (commandline -poc)' -a "
-	all\t'List all packages'
-	available\t'List packages available for installation'
-	updates\t'List packages with updates available'
-	installed\t'List installed packages'
-	extras\t'List packages not available in repositories'
-	obsoletes\t'List packages that are obsoleted by packages in repositories'
-"
+complete -c yum -n 'contains list (commandline -poc)' -a all --description 'List all packages'
+complete -c yum -n 'contains list (commandline -poc)' -a available --description 'List packages available for installation'
+complete -c yum -n 'contains list (commandline -poc)' -a updates --description 'List packages with updates available'
+complete -c yum -n 'contains list (commandline -poc)' -a installed --description 'List installed packages'
+complete -c yum -n 'contains list (commandline -poc)' -a extras --description 'List packages not available in repositories'
+complete -c yum -n 'contains list (commandline -poc)' -a obsoletes --description 'List packages that are obsoleted by packages in repositories'
 
-complete -c yum -n 'contains clean (commandline -poc)' -x -a "
-	packages\t'Delete cached package files'
-	headers\t'Delete cached header files'
-	all\t'Delete all cache contents'
-"
+complete -c yum -n 'contains clean (commandline -poc)' -x -a packages --description 'Delete cached package files'
+complete -c yum -n 'contains clean (commandline -poc)' -x -a headers --description 'Delete cached header files'
+complete -c yum -n 'contains clean (commandline -poc)' -x -a all --description 'Delete all cache contents'