Merge tag 'zsh-5.2-test-1' into debian

3 files changed, 4 insertions, 2 deletions

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:
diff --git a/Util/helpfiles b/Util/helpfiles
index 699ca8321..9e837fe2d 100755
--- a/Util/helpfiles
+++ b/Util/helpfiles
@@ -19,7 +19,7 @@
 # This script is called automatically during `make install'
 # unless specified otherwise.
 
-# For usage and and more information see zshcontrib(1).
+# For usage and more information see zshcontrib(1).
 
 sub Usage {
     print(STDERR "Usage: helpfiles zshbuiltins.1 dest-dir [link-file]\n");
diff --git a/Util/zyodl.vim b/Util/zyodl.vim
index b67bfa54e..d0d3cf54f 100644
--- a/Util/zyodl.vim
+++ b/Util/zyodl.vim
@@ -10,6 +10,8 @@
 " 2. Create ~/.vim/filetype.vim as explained in ":help new-filetype" case C.
 " 3. Add the following command to ~/.vim/filetype.vim:
 "      autocmd BufRead,BufNewFile **/Doc/Zsh/*.yo setfiletype zyodl
+" Or alternatively:
+" 1. Append the contents of Doc/Zsh/.vimrc to your .vimrc, changing «<sfile>» to «%».
 
 "" Test case:
 "   texinode()()()()