Merge tag 'zsh-5.3.1' into debian

Release 5.3.1.

11 files changed, 77 insertions, 20 deletions

diff --git a/ChangeLog b/ChangeLog
index 91a8b507e..0a1ac628c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,42 @@
+2016-12-21  Peter Stephenson  <p.w.stephenson@ntlworld.com>
+
+	* unposted: Config/version.mk, Etc/FAQ.yo, NEWS, README:
+	release 5.3.1:
+
+2016-12-18  Baptiste Daroussin  <bapt@FreeBSD.org>
+
+	* 40210: Completion/Unix/Command/_sysctl: Add support modern
+	FreeBSD and drop support for FreeBSD < 5
+
+2016-12-18  Baptiste Daroussin  <bapt@gandi.net>
+
+	* 40209: Completion/BSD/Command/_chflags: Fix typo in chflags
+	completion
+
+2016-12-16  Daniel Shahaf  <d.s@daniel.shahaf.name>
+
+	* 40149: Functions/VCS_Info/Backends/VCS_INFO_get_data_git:
+	vcs_info git: Avoid a fork.
+
+	* 40203: Test/B03print.ztst: Resolve 'printf --' question from
+	grandparent commit (thanks Chet).
+
+2016-12-15  Barton E. Schaefer  <schaefer@zsh.org>
+
+	* 40198: Test/V10private.ztst: output of B02typeset differs when
+	(( UID == 0 )) so do not attempt to redo that test in that case
+
+2016-12-14  Barton E. Schaefer  <schaefer@zsh.org>
+
+	* 40179: Src/builtin.c: fix handling of "printf -" and "printf --"
+
+	* unposted: Test/B03print.ztst: regression for 40179 / 37467
+
+2016-12-12  Peter Stephenson  <p.w.stephenson@ntlworld.com>
+
+	* unposted: Config/version.mk: update to 5.3-dev-0 to avoid
+	clash with installed 5.3.
+
 2016-12-10  Barton E. Schaefer  <schaefer@zsh.org>
 
 	* 40134: Src/builtin.c, Src/Zle/compmatch.c: silence spurious
diff --git a/Completion/BSD/Command/_chflags b/Completion/BSD/Command/_chflags
index 43042bee4..075782cd9 100644
--- a/Completion/BSD/Command/_chflags
+++ b/Completion/BSD/Command/_chflags
@@ -35,7 +35,7 @@ if [[ $OSTYPE = (darwin|dragonfly|freebsd|netbsd)* ]]; then
   fi
 
   if [[ $OSTYPE = (dragonfly|freebsd)* ]]; then
-    addlfags uunlnk 'user undeletable'
+    addflags uunlnk 'user undeletable'
     (( EUID )) || addflags sunlnk 'system undeletable'
   fi
 
diff --git a/Completion/Unix/Command/_sysctl b/Completion/Unix/Command/_sysctl
index cf88c3dc1..c5bb26eb0 100644
--- a/Completion/Unix/Command/_sysctl
+++ b/Completion/Unix/Command/_sysctl
@@ -10,10 +10,10 @@ case $OSTYPE in
       '-W[display only writable variables that are not statistical]'
     )
   ;|
-  dragonfly*|freebsd<8->.*)
+  dragonfly*|freebsd*)
     args+=( "-i[silently exit if variable doesn't exist]" )
   ;|
-  *freebsd<5->.*|freebsd4.[4-9]*)
+  freebsd*)
     local -a sysctlvars
     sysctlvars=( $(_call_program sysctl-variables sysctl -aN) )
     _arguments -s -S -A "-*" $args \
@@ -31,7 +31,7 @@ case $OSTYPE in
       '(-o)-x[show opaques as well (entire values)]' \
       '(-a)*:sysctl variable:_multi_parts -i . sysctlvars'
   ;;
-  freebsd[0-4].*|darwin*|dragonfly*)
+  darwin*|dragonfly*)
     : ${(A)_cache_sysctlvars:=${${$(sysctl -A 2>/dev/null):#[^a-z]*}%%:*}}
     _arguments -s -A "-*" $args \
       '(-w -X *)-a[list all]' \
diff --git a/Config/version.mk b/Config/version.mk
index 45558e39d..5f6bd4efa 100644
--- a/Config/version.mk
+++ b/Config/version.mk
@@ -27,5 +27,5 @@
 # This must also serve as a shell script, so do not add spaces around the
 # `=' signs.
 
-VERSION=5.3
-VERSION_DATE='December 11, 2016'
+VERSION=5.3.1
+VERSION_DATE='December 21, 2016'
diff --git a/Etc/FAQ.yo b/Etc/FAQ.yo
index bfd2ce868..6b635ea3e 100644
--- a/Etc/FAQ.yo
+++ b/Etc/FAQ.yo
@@ -306,7 +306,7 @@ sect(On what machines will it run?)
 
 sect(What's the latest version?)
 
-  Zsh 5.3 is the latest production version.  For details of all the
+  Zsh 5.3.1 is the latest production version.  For details of all the
   changes, see the NEWS file in the source distribution.
 
   A beta of the next version is sometimes available.  Development of zsh is
diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
index 65d8cb182..63109aa46 100644
--- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
+++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
@@ -221,7 +221,7 @@ elif [[ -d "${gitdir}/rebase-merge" ]]; then
         git_patches_applied+=("$p")
     done
     if [[ -f "${patchdir}/git-rebase-todo" ]] ; then
-        git_patches_unapplied=(${(f)"$(grep -v '^$' "${patchdir}/git-rebase-todo" | grep -v '^#')"})
+        git_patches_unapplied=( ${${(f)${"$(<"${patchdir}/git-rebase-todo")"}}:#[#]*} )
     fi
     VCS_INFO_git_handle_patches
 elif [[ -d "${gitdir}/rebase-apply" ]]; then
diff --git a/NEWS b/NEWS
index ba9eb9b2c..547925164 100644
--- a/NEWS
+++ b/NEWS
@@ -4,8 +4,10 @@ CHANGES FROM PREVIOUS VERSIONS OF ZSH
 
 Note also the list of incompatibilities in the README file.
 
-Changes from 5.2 to 5.3
------------------------
+Changes from 5.2 to 5.3.1
+-------------------------
+
+There are only minor compatibility fixes between 5.3 and 5.3.1.
 
 It is possible to enable character width support for Unicode 9 by
 configuring with `--enable-unicode9'; this compiles in some additional
diff --git a/README b/README
index 9f554de52..5646ff00a 100644
--- a/README
+++ b/README
@@ -5,10 +5,10 @@ THE Z SHELL (ZSH)
 Version
 -------
 
-This is version 5.3 of the shell.  This is a stable release.  There are
+This is version 5.3.1 of the shell.  This is a stable release.  There are
 a few visible improvements since 5.2 as well as many bugfixes.  Note
 in particular the changs highlighted under "Incompatibilites
-between 5.2 and 5.3" below.  See NEWS for more information.
+between 5.2 and 5.3.1" below.  See NEWS for more information.
 
 Installing Zsh
 --------------
@@ -29,8 +29,8 @@ Zsh is a shell with lots of features.  For a list of some of these, see the
 file FEATURES, and for the latest changes see NEWS.  For more
 details, see the documentation.
 
-Incompatibilities between 5.2 and 5.3
--------------------------------------
+Incompatibilities between 5.2 and 5.3.1
+---------------------------------------
 
 1) In character classes delimited by "[" and "]" within patterns, whether
 used for filename generation (globbing) or other forms of pattern
diff --git a/Src/builtin.c b/Src/builtin.c
index 65e0cb10b..0f04d149f 100644
--- a/Src/builtin.c
+++ b/Src/builtin.c
@@ -100,7 +100,7 @@ static struct builtin builtins[] =
 
     BUILTIN("popd", BINF_SKIPINVALID | BINF_SKIPDASH | BINF_DASHDASHVALID, bin_cd, 0, 1, BIN_POPD, "q", NULL),
     BUILTIN("print", BINF_PRINTOPTS, bin_print, 0, -1, BIN_PRINT, "abcC:Df:ilmnNoOpPrRsSu:v:x:X:z-", NULL),
-    BUILTIN("printf", 0, bin_print, 1, -1, BIN_PRINTF, "v:", NULL),
+    BUILTIN("printf", BINF_SKIPINVALID | BINF_SKIPDASH, bin_print, 1, -1, BIN_PRINTF, "v:", NULL),
     BUILTIN("pushd", BINF_SKIPINVALID | BINF_SKIPDASH | BINF_DASHDASHVALID, bin_cd, 0, 2, BIN_PUSHD, "qsPL", NULL),
     BUILTIN("pushln", 0, bin_print, 0, -1, BIN_PRINT, NULL, "-nz"),
     BUILTIN("pwd", 0, bin_pwd, 0, 0, 0, "rLP", NULL),
diff --git a/Test/B03print.ztst b/Test/B03print.ztst
index 3f9a4046d..c65568ad9 100644
--- a/Test/B03print.ztst
+++ b/Test/B03print.ztst
@@ -322,3 +322,15 @@
  typeset -p foo
 0:printf to an array variable without format string reuse
 >typeset foo=string
+
+ printf -
+ printf - -
+ printf --
+ printf -- -
+ printf -- --
+ printf -x -v foo
+ # Final print for newline on stdout
+ print
+0:regression test of printf with assorted ambiguous options or formats
+>------x
+?(eval):printf:3: not enough arguments
diff --git a/Test/V10private.ztst b/Test/V10private.ztst
index 7ebf5a87f..78ecd48ea 100644
--- a/Test/V10private.ztst
+++ b/Test/V10private.ztst
@@ -15,11 +15,6 @@
  (zmodload -u zsh/param/private && zmodload zsh/param/private)
 0:unload and reload the module without crashing
 
- ZTST_verbose=0 $ZTST_exe +Z -f $ZTST_srcdir/ztst.zsh private.TMP/B02
-0:typeset still works with zsh/param/private module loaded
-*>*
-*>*
-
  typeset scalar_test=toplevel
  () {
   print $scalar_test
@@ -295,6 +290,15 @@ F:future revision will create a global with this assignment
  () { private -h SECONDS }
 0:private parameter may hide a special parameter
 
+ if (( UID )); then
+   ZTST_verbose=0 $ZTST_exe +Z -f $ZTST_srcdir/ztst.zsh private.TMP/B02
+ else
+   ZTST_skip="cannot re-run typeset tests when tests run as superuser"
+ fi
+0:typeset still works with zsh/param/private module loaded
+*>*
+*>*
+
 %clean
 
   rm -r private.TMP