From 0083555925b7866a1ba3884c03e248fd34105c52 Mon Sep 17 00:00:00 2001 From: mk2 Date: Sun, 4 Aug 2019 11:43:15 +0900 Subject: [PATCH] Move __fish_complete_abook_formats to abook --- share/completions/abook.fish | 13 +++++++++++++ share/functions/__fish_complete_abook_formats.fish | 13 ------------- 2 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 share/functions/__fish_complete_abook_formats.fish diff --git a/share/completions/abook.fish b/share/completions/abook.fish index a2dc51b97..7ba131ee1 100644 --- a/share/completions/abook.fish +++ b/share/completions/abook.fish @@ -1,4 +1,17 @@ +function __fish_complete_abook_formats --description 'Complete abook formats' + set -l pat + switch $argv[1] + case in + set pat '/output:/,$d; /input:\|^$/d' + case out + set pat '/input:/,/output:/d; /^$/d' + case '*' + return 1 + end + abook --formats | sed -e $pat -e 's/^\s\+//' +end + complete -c abook -s h -d 'Show usage' complete -c abook -s C -l config -d 'Use an alternative configuration file' -r complete -c abook -l datafile -d 'Use an alternative addressbook file' -r diff --git a/share/functions/__fish_complete_abook_formats.fish b/share/functions/__fish_complete_abook_formats.fish deleted file mode 100644 index bc58a2267..000000000 --- a/share/functions/__fish_complete_abook_formats.fish +++ /dev/null @@ -1,13 +0,0 @@ -function __fish_complete_abook_formats --description 'Complete abook formats' - set -l pat - switch $argv[1] - case in - set pat '/output:/,$d; /input:\|^$/d' - case out - set pat '/input:/,/output:/d; /^$/d' - case '*' - return 1 - end - abook --formats | sed -e $pat -e 's/^\s\+//' - -end