From 02fe884a11e814192981d32f7a67a3ee450ff70a Mon Sep 17 00:00:00 2001 From: Frank Terbeck Date: Sun, 6 Nov 2016 22:50:37 +0100 Subject: [PATCH] 39847: Update helper function name pattern MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In 580698bc71, Oliver updated a whole bunch of options in a number of completions. While at it, he also changed a bit of coding style, to better adhere to Etc/zsh-development-guide — among those changes is to convert "function foobar() {" function definitions to "foobar() {". This broke Util/check-tmux-state so that it couldn't detect any supported tmux sub-commands within _tmux anymore. This updates the regular expression that is used in the script to match and list these function definitions. --- ChangeLog | 5 +++++ Util/check-tmux-state | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 6499cf06e..589295006 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2016-11-06 Frank Terbeck + + * 39847: Util/check-tmux-state: Update helper function name + pattern + 2016-11-05 Barton E. Schaefer * unposted: Completion/compaudit: tweak replacement getent diff --git a/Util/check-tmux-state b/Util/check-tmux-state index 4cba36070..2c6106203 100644 --- a/Util/check-tmux-state +++ b/Util/check-tmux-state @@ -58,7 +58,7 @@ __tmux-window-options # Subcommand helper functions are defined like "function _tmux-foo() {" # in the _tmux function definition file. typeset -a supported_commands -supported_commands=( $( grep 'function *\<_tmux-' $func | +supported_commands=( $( grep '^_tmux-[^(]*() *{$' $func | sed -e 's,^.*\<_tmux-,,' -e 's,(.*$,,' ) ) # Ask tmux for available commands: