From b3f8a93e02e6206f04c65271fd3b20df6fcd2e5b Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 3 Dec 2019 18:16:46 +0900 Subject: [PATCH] Move __fish_print_abook_emails into mutt completion script --- po/de.po | 5 ----- po/en.po | 4 ---- po/fr.po | 4 ---- po/nb.po | 4 ---- po/nn.po | 4 ---- po/pl.po | 4 ---- po/pt_BR.po | 5 ----- po/sv.po | 4 ---- po/zh_CN.po | 4 ---- share/completions/mutt.fish | 6 +++++- share/functions/__fish_print_abook_emails.fish | 4 ---- 11 files changed, 5 insertions(+), 43 deletions(-) delete mode 100644 share/functions/__fish_print_abook_emails.fish diff --git a/po/de.po b/po/de.po index 9c97215bf..3aee82ef7 100644 --- a/po/de.po +++ b/po/de.po @@ -67455,11 +67455,6 @@ msgstr "" msgid "Obtain a list of ports local collections" msgstr "Liste laufender screen-Sitzungen ausgeben" -#: /tmp/fish/implicit/share/functions/__fish_print_abook_emails.fish:1 -#, fuzzy -msgid "Print email addresses (abook)" -msgstr "Tote Prozesse ausgeben" - #: /tmp/fish/implicit/share/functions/__fish_print_addresses.fish:1 #, fuzzy msgid "Print a list of known network addresses" diff --git a/po/en.po b/po/en.po index bccfdc556..f3beabd7e 100644 --- a/po/en.po +++ b/po/en.po @@ -66804,10 +66804,6 @@ msgstr "" msgid "Obtain a list of ports local collections" msgstr "Print a list of local users" -#: /tmp/fish/implicit/share/functions/__fish_print_abook_emails.fish:1 -msgid "Print email addresses (abook)" -msgstr "Print email addresses (abook)" - #: /tmp/fish/implicit/share/functions/__fish_print_addresses.fish:1 msgid "Print a list of known network addresses" msgstr "Print a list of known network addresses" diff --git a/po/fr.po b/po/fr.po index 0c06c6acb..4a0d674ae 100644 --- a/po/fr.po +++ b/po/fr.po @@ -65773,10 +65773,6 @@ msgstr "" msgid "Obtain a list of ports local collections" msgstr "" -#: /tmp/fish/implicit/share/functions/__fish_print_abook_emails.fish:1 -msgid "Print email addresses (abook)" -msgstr "Afficher les adresses email (abook)" - #: /tmp/fish/implicit/share/functions/__fish_print_addresses.fish:1 msgid "Print a list of known network addresses" msgstr "" diff --git a/po/nb.po b/po/nb.po index 4295f20af..b6b72c1b2 100644 --- a/po/nb.po +++ b/po/nb.po @@ -62226,10 +62226,6 @@ msgstr "" msgid "Obtain a list of ports local collections" msgstr "" -#: /tmp/fish/implicit/share/functions/__fish_print_abook_emails.fish:1 -msgid "Print email addresses (abook)" -msgstr "" - #: /tmp/fish/implicit/share/functions/__fish_print_addresses.fish:1 msgid "Print a list of known network addresses" msgstr "" diff --git a/po/nn.po b/po/nn.po index 2d6005502..ea4ac501c 100644 --- a/po/nn.po +++ b/po/nn.po @@ -62226,10 +62226,6 @@ msgstr "" msgid "Obtain a list of ports local collections" msgstr "" -#: /tmp/fish/implicit/share/functions/__fish_print_abook_emails.fish:1 -msgid "Print email addresses (abook)" -msgstr "" - #: /tmp/fish/implicit/share/functions/__fish_print_addresses.fish:1 msgid "Print a list of known network addresses" msgstr "" diff --git a/po/pl.po b/po/pl.po index fef177869..2a31f0d72 100644 --- a/po/pl.po +++ b/po/pl.po @@ -62816,10 +62816,6 @@ msgstr "" msgid "Obtain a list of ports local collections" msgstr "" -#: /tmp/fish/implicit/share/functions/__fish_print_abook_emails.fish:1 -msgid "Print email addresses (abook)" -msgstr "" - #: /tmp/fish/implicit/share/functions/__fish_print_addresses.fish:1 msgid "Print a list of known network addresses" msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index db3f7b34c..0f7848944 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -67934,11 +67934,6 @@ msgstr "" msgid "Obtain a list of ports local collections" msgstr "Print a list of all accepted color names" -#: /tmp/fish/implicit/share/functions/__fish_print_abook_emails.fish:1 -#, fuzzy -msgid "Print email addresses (abook)" -msgstr "Print dead processes" - #: /tmp/fish/implicit/share/functions/__fish_print_addresses.fish:1 #, fuzzy msgid "Print a list of known network addresses" diff --git a/po/sv.po b/po/sv.po index 8c8b288f2..91406d12a 100644 --- a/po/sv.po +++ b/po/sv.po @@ -62230,10 +62230,6 @@ msgstr "" msgid "Obtain a list of ports local collections" msgstr "" -#: /tmp/fish/implicit/share/functions/__fish_print_abook_emails.fish:1 -msgid "Print email addresses (abook)" -msgstr "" - #: /tmp/fish/implicit/share/functions/__fish_print_addresses.fish:1 msgid "Print a list of known network addresses" msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index ba178b213..cd4306433 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -62777,10 +62777,6 @@ msgstr "" msgid "Obtain a list of ports local collections" msgstr "" -#: /tmp/fish/implicit/share/functions/__fish_print_abook_emails.fish:1 -msgid "Print email addresses (abook)" -msgstr "" - #: /tmp/fish/implicit/share/functions/__fish_print_addresses.fish:1 msgid "Print a list of known network addresses" msgstr "" diff --git a/share/completions/mutt.fish b/share/completions/mutt.fish index 35b6f30e1..b0dccc4b5 100644 --- a/share/completions/mutt.fish +++ b/share/completions/mutt.fish @@ -1,3 +1,8 @@ +function __fish_print_abook_emails --description 'Print email addresses (abook)' + abook --mutt-query "" | string match -r -v '^\s*$' + +end + if command -sq abook complete -c mutt -f -a '(__fish_print_abook_emails)' complete -c mutt -s c -x -d 'Specify a carbon-copy (CC) recipient' -a '(__fish_print_abook_emails)' @@ -27,4 +32,3 @@ complete -r -c mutt -s i -d 'Specify a file to include into the body of a messag complete -r -c mutt -s m -d 'Specify a default mailbox type' complete -r -c mutt -s Q -d 'Query a configuration variables value' complete -r -c mutt -s s -d 'Specify the subject of the message' - diff --git a/share/functions/__fish_print_abook_emails.fish b/share/functions/__fish_print_abook_emails.fish deleted file mode 100644 index 671dbb50e..000000000 --- a/share/functions/__fish_print_abook_emails.fish +++ /dev/null @@ -1,4 +0,0 @@ -function __fish_print_abook_emails --description 'Print email addresses (abook)' - abook --mutt-query "" | string match -r -v '^\s*$' - -end