From 8b73bac5803935c1c9438d75103da67903aa83f9 Mon Sep 17 00:00:00 2001 From: axel Date: Sun, 3 Dec 2006 09:34:33 +1000 Subject: [PATCH] Rename __fish_complete_directory to increase consistency darcs-hash:20061202233433-ac50b-48368a338773ad47807b0032389fd305d86b3275.gz --- share/completions/configure.fish | 6 +++--- share/completions/cp.fish | 2 +- share/completions/darcs.fish | 2 +- share/completions/gpg.fish | 2 +- share/completions/make.fish | 4 ++-- share/completions/man.fish | 2 +- share/completions/mv.fish | 2 +- share/completions/rmdir.fish | 2 +- share/completions/rpm.fish | 8 ++++---- share/completions/ruby.fish | 2 +- share/functions/__fish_complete_cd.fish | 2 +- ...te_directory.fish => __fish_complete_directories.fish} | 2 +- share/functions/__fish_complete_suffix.fish | 2 +- 13 files changed, 19 insertions(+), 19 deletions(-) rename share/functions/{__fish_complete_directory.fish => __fish_complete_directories.fish} (82%) diff --git a/share/completions/configure.fish b/share/completions/configure.fish index c693f6b78..c05fee3a7 100644 --- a/share/completions/configure.fish +++ b/share/completions/configure.fish @@ -4,9 +4,9 @@ complete -c configure -s q -l quiet -d (N_ "Quiet mode") complete -c configure -l cache-file -f -d (N_ "Cache test results in specified file") complete -c configure -s C -l config-cache -d (N_ "Cache test results in file config.cache") complete -c configure -s n -l no-create -d (N_ "Do not create output files") -complete -c configure -l srcdir -d (N_ "Set source directory") -a "__fish_complete_directory (commandline -ct)" -x -complete -c configure -l prefix -d (N_ "Architecture-independent install directory") -a "__fish_complete_directory (commandline -ct)" -x -complete -c configure -l exec-prefix -d (N_ "Architecture-dependent install directory") -a "__fish_complete_directory (commandline -ct)" -x +complete -c configure -l srcdir -d (N_ "Set source directory") -a "__fish_complete_directories (commandline -ct)" -x +complete -c configure -l prefix -d (N_ "Architecture-independent install directory") -a "__fish_complete_directories (commandline -ct)" -x +complete -c configure -l exec-prefix -d (N_ "Architecture-dependent install directory") -a "__fish_complete_directories (commandline -ct)" -x complete -c configure -l build -d (N_ "Configure for building on BUILD") -x complete -c configure -l host -d (N_ "Cross-compile to build programs to run on HOST") -x complete -c configure -l target -d (N_ "Configure for building compilers for TARGET") -x -u diff --git a/share/completions/cp.fish b/share/completions/cp.fish index 4139cf490..6c34cf01b 100644 --- a/share/completions/cp.fish +++ b/share/completions/cp.fish @@ -8,7 +8,7 @@ complete -c cp -s H -d (N_ "Follow command-line symbolic links") complete -c cp -s l -l link -d (N_ "Link files instead of copying") complete -c cp -l strip-trailing-slashes -d (N_ "Remove trailing slashes from source") complete -c cp -s S -l suffix -r -d (N_ "Backup suffix") -complete -c cp -s t -l target-directory -d (N_ "Target directory") -x -a "(__fish_complete_directory (commandline -ct) 'Target directory')" +complete -c cp -s t -l target-directory -d (N_ "Target directory") -x -a "(__fish_complete_directories (commandline -ct) 'Target directory')" complete -c cp -s u -l update -d (N_ "Do not overwrite newer files") complete -c cp -s v -l verbose -d (N_ "Verbose mode") complete -c cp -l help -d (N_ "Display help and exit") diff --git a/share/completions/darcs.fish b/share/completions/darcs.fish index fb119a8a1..e0478dbf7 100644 --- a/share/completions/darcs.fish +++ b/share/completions/darcs.fish @@ -43,7 +43,7 @@ complete -c darcs -n '__fish_use_subcommand' -xa 'repair\t"'(_ "Repair the corru # complete -c darcs -s h -l help -d (N_ "Shows brief description of command and its arguments") complete -c darcs -l disable -d (N_ "Disable this command") -complete -c darcs -l repodir -d (N_ "Specify the repository directory in which to run") -x -a '(__fish_complete_directory (commandline -ct))' +complete -c darcs -l repodir -d (N_ "Specify the repository directory in which to run") -x -a '(__fish_complete_directories (commandline -ct))' complete -c darcs -s v -l verbose -d (N_ "Verbose mode") complete -c darcs -l standard-verbosity -d (N_ "Neither verbose nor quiet output") diff --git a/share/completions/gpg.fish b/share/completions/gpg.fish index 903fa44fc..1d94a4472 100644 --- a/share/completions/gpg.fish +++ b/share/completions/gpg.fish @@ -176,7 +176,7 @@ complete -c gpg -l secret-keyring -r -d (N_ "Add specified file to the current l complete -c gpg -l primary-keyring -r -d (N_ "Designate specified file as the primary public keyring") complete -c gpg -l trustdb-name -r -d (N_ "Use specified file instead of the default trustdb") -complete -c gpg -l homedir -xa "(__fish_complete_directory (commandline -ct))" -d (N_ "Set the home directory") +complete -c gpg -l homedir -xa "(__fish_complete_directories (commandline -ct))" -d (N_ "Set the home directory") complete -c gpg -l display-charset -xa " iso-8859-1 iso-8859-2 iso-8859-15 koi8-r utf-8 " -d (N_ "Set the native character set") complete -c gpg -l utf8-strings -d (N_ "Assume that following command line arguments are given in UTF8") diff --git a/share/completions/make.fish b/share/completions/make.fish index 93da6b2f8..66a97ca75 100644 --- a/share/completions/make.fish +++ b/share/completions/make.fish @@ -16,11 +16,11 @@ complete -c make --condition $is_assignment -a $complete_file_assignment complete -x -c make -a "(__fish_print_make_targets)" -d (N_ "Target") complete -r -c make -s f -d (N_ "Use file as makefile") -r -complete -x -c make -s C -x -a "(__fish_complete_directory (commandline -ct))" -d (N_ "Change directory") +complete -x -c make -s C -x -a "(__fish_complete_directories (commandline -ct))" -d (N_ "Change directory") complete -c make -s d -d (N_ "Debug mode") complete -c make -s e -d (N_ "Environment before makefile") complete -c make -s i -d (N_ "Ignore errors") -complete -x -c make -s I -d (N_ "Search directory for makefile") -a "(__fish_complete_directory (commandline -ct))" +complete -x -c make -s I -d (N_ "Search directory for makefile") -a "(__fish_complete_directories (commandline -ct))" complete -x -c make -s j -d (N_ "Number of concurrent jobs") complete -c make -s k -d (N_ "Continue after an error") complete -c make -s l -d (N_ "Start when load drops") diff --git a/share/completions/man.fish b/share/completions/man.fish index 79b3d574b..1e829958b 100644 --- a/share/completions/man.fish +++ b/share/completions/man.fish @@ -16,7 +16,7 @@ complete -xc man -a l -d (N_ "Local section") complete -xc man -a p complete -xc man -a o -d (N_ "Old section") complete -rc man -s C -d (N_ "Configuration file") -complete -xc man -s M -a "(__fish_complete_directory (commandline -ct))" -d (N_ "Manpath") +complete -xc man -s M -a "(__fish_complete_directories (commandline -ct))" -d (N_ "Manpath") complete -rc man -s P -d (N_ "Pager") complete -xc man -s S -d (N_ "Manual sections") complete -c man -s a -d (N_ "Display all matches") diff --git a/share/completions/mv.fish b/share/completions/mv.fish index 26b375825..554f87a00 100644 --- a/share/completions/mv.fish +++ b/share/completions/mv.fish @@ -4,7 +4,7 @@ complete -c mv -s i -l interactive -d (N_ "Prompt before overwrite") complete -c mv -l reply -x -a "yes no query" -d (N_ "Answer for overwrite questions") complete -c mv -l strip-trailing-slashes -d (N_ "Remove trailing slashes from source") complete -c mv -s S -l suffix -r -d (N_ "Backup suffix") -complete -c mv -l target-directory -d (N_ "Target directory") -x -a "(__fish_complete_directory (commandline -ct) 'Target directory')" +complete -c mv -l target-directory -d (N_ "Target directory") -x -a "(__fish_complete_directories (commandline -ct) 'Target directory')" complete -c mv -s u -l update -d (N_ "Do not overwrite newer files") complete -c mv -s v -l verbose -d (N_ "Verbose mode") complete -c mv -l help -d (N_ "Display help and exit") diff --git a/share/completions/rmdir.fish b/share/completions/rmdir.fish index f8e116a1b..15879fd8e 100644 --- a/share/completions/rmdir.fish +++ b/share/completions/rmdir.fish @@ -1,5 +1,5 @@ #Completions for rmdir -complete -x -c rmdir -a "(__fish_complete_directory (commandline -ct))" +complete -x -c rmdir -a "(__fish_complete_directories (commandline -ct))" complete -c rmdir -l ignore-fail-on-non-empty -d (N_ "Ignore errors from non-empty directories") complete -c rmdir -s p -l parents -d (N_ "Remove each component of path") complete -c rmdir -s v -l verbose -d (N_ "Verbose mode") diff --git a/share/completions/rpm.fish b/share/completions/rpm.fish index 83d857105..a0abf10ff 100644 --- a/share/completions/rpm.fish +++ b/share/completions/rpm.fish @@ -9,12 +9,12 @@ complete -c rpm -l rcfile -d (N_ "List of rpm configuration files") -f complete -c rpm -l pipe -d (N_ "Pipe output through specified command") -r complete -c rpm -l dbpath -d (N_ "Specify directory for rpm database") -a " ( - __fish_complete_directory (commandline -ct) 'Rpm database directory' + __fish_complete_directories (commandline -ct) 'Rpm database directory' ) " complete -c rpm -l root -d (N_ "Specify root directory for rpm operations") -a " ( - __fish_complete_directory (commandline -ct) 'Root directory for rpm operations' + __fish_complete_directories (commandline -ct) 'Root directory for rpm operations' ) " @@ -22,7 +22,7 @@ set -- rpm_install -c rpm -n "__fish_contains_opt -s i -s U -s F install upgrade complete $rpm_install -l aid -d (N_ "Add suggested packages to the transaction set when needed") complete $rpm_install -l allfiles -d (N_ "Installs or upgrades all the files in the package, even if they aren't needed (missingok) and don't exist") complete $rpm_install -l badreloc -d (N_ "Used with --relocate, permit relocations on all file paths, not just those OLD-PATH's included in the binary package relocation hint(s)") -complete $rpm_install -l excludepath -d (N_ "Don't install files whose name begins with specified path") -xa "(__fish_complete_directory (commandline -ct) 'Skip installation of files in this directory')" +complete $rpm_install -l excludepath -d (N_ "Don't install files whose name begins with specified path") -xa "(__fish_complete_directories (commandline -ct) 'Skip installation of files in this directory')" complete $rpm_install -l excludedocs -d (N_ "Don't install any files which are marked as documentation") complete $rpm_install -l force -d (N_ 'Same as using --replacepkgs, --replacefiles, and --oldpackage') complete $rpm_install -s h -l hash -d (N_ 'Print 50 hash marks as the package archive is unpacked') @@ -47,7 +47,7 @@ complete $rpm_install -l notriggerun -d (N_ "Don't execute triggerun scriptlets" complete $rpm_install -l notriggerpostun -d (N_ "Don't execute triggerpostun scriptlets") complete $rpm_install -l oldpackage -d (N_ 'Allow an upgrade to replace a newer package with an older one') complete $rpm_install -l percent -d (N_ 'Print percentages as files are unpacked from the package archive. This is intended to make rpm easy to run from other tools') -complete $rpm_install -l prefix -d (N_ 'For relocatable binary packages, translate all file paths that start with the installation prefix in the package relocation hint(s) to NEWPATH') -xa "(__fish_complete_directory (commandline -ct) 'Directory prefix for relocatable packages')" +complete $rpm_install -l prefix -d (N_ 'For relocatable binary packages, translate all file paths that start with the installation prefix in the package relocation hint(s) to NEWPATH') -xa "(__fish_complete_directories (commandline -ct) 'Directory prefix for relocatable packages')" complete $rpm_install -l relocate -x -d (N_ "Translate all paths that start with first half of following parameter to second half of following parameter" ) complete $rpm_install -l repackage -d (N_ 'Re-package the files before erasing') complete $rpm_install -l replacefiles -d (N_ 'Install the packages even if they replace files from other, already installed, packages') diff --git a/share/completions/ruby.fish b/share/completions/ruby.fish index 8553bae3f..78cabbeed 100644 --- a/share/completions/ruby.fish +++ b/share/completions/ruby.fish @@ -20,6 +20,6 @@ complete -c ruby -s v -l verbose -d (N_ 'Verbose mode') complete -c ruby -s w -d (N_ 'Verbose mode without message') complete -c ruby -l version -d (N_ 'Display version and exit') complete -c ruby -s x -d (N_ 'Extract script') -complete -c ruby -s X -x -a '(__fish_complete_directory (commandline -ct))' -d (N_ 'Directory') +complete -c ruby -s X -x -a '(__fish_complete_directories (commandline -ct))' -d (N_ 'Directory') complete -c ruby -s y -l yydebug -d (N_ 'Compiler debug mode') diff --git a/share/functions/__fish_complete_cd.fish b/share/functions/__fish_complete_cd.fish index a43bac674..c4a6695ac 100644 --- a/share/functions/__fish_complete_cd.fish +++ b/share/functions/__fish_complete_cd.fish @@ -1,7 +1,7 @@ function __fish_complete_cd -d "Completions for the cd command" # - # We can't simply use __fish_complete_directory because of the CDPATH + # We can't simply use __fish_complete_directories because of the CDPATH # set -l wd $PWD diff --git a/share/functions/__fish_complete_directory.fish b/share/functions/__fish_complete_directories.fish similarity index 82% rename from share/functions/__fish_complete_directory.fish rename to share/functions/__fish_complete_directories.fish index af3844d5a..ac231b586 100644 --- a/share/functions/__fish_complete_directory.fish +++ b/share/functions/__fish_complete_directories.fish @@ -3,7 +3,7 @@ # with description $argv[2] if defined, otherwise use 'Directory' # -function __fish_complete_directory -d "Complete using directories" +function __fish_complete_directories -d "Complete using directories" set -- comp $argv[1] set -- desc (_ Directory) diff --git a/share/functions/__fish_complete_suffix.fish b/share/functions/__fish_complete_suffix.fish index 78c5d2e00..ab0a7ff53 100644 --- a/share/functions/__fish_complete_suffix.fish +++ b/share/functions/__fish_complete_suffix.fish @@ -21,6 +21,6 @@ function __fish_complete_suffix -d "Complete using files" # with the correct suffix in a subdirectory # - __fish_complete_directory $comp + __fish_complete_directories $comp end