From 8ed053f7223d63aa35fdf62a7c6d2edb4541ae2e Mon Sep 17 00:00:00 2001 From: Kamil Dudka Date: Wed, 27 Jan 2016 09:48:32 +0100 Subject: [PATCH] zsh-5.2-vcs_info.patch: use annotated upstream patches --- zsh-5.2-vcs_info.patch | 45 +++++++++++++++++++++++++++++++++--------- 1 file changed, 36 insertions(+), 9 deletions(-) diff --git a/zsh-5.2-vcs_info.patch b/zsh-5.2-vcs_info.patch index 55ae399..8432bf8 100644 --- a/zsh-5.2-vcs_info.patch +++ b/zsh-5.2-vcs_info.patch @@ -1,9 +1,13 @@ -Fix bug in VCS_INFO_nbcsformats which breaks my prompt.... +From 17f17599d33e334d3ec78ab94956f440f18aaf04 Mon Sep 17 00:00:00 2001 +From: Peter Stephenson +Date: Tue, 8 Dec 2015 12:59:48 +0000 +Subject: [PATCH 1/2] 37347: Remove incorrect local for msgs in VCS info -Reported upstream in: - http://www.zsh.org/mla/users/2016/msg00007.html -And fix suggested in: - http://www.zsh.org/mla/users/2016/msg00008.html +Upstream-commit: 4105f79a3a9b5a85c4ce167865e5ac661be160dc +Signed-off-by: Kamil Dudka +--- + Functions/VCS_Info/VCS_INFO_nvcsformats | 1 - + 1 file changed, 1 deletion(-) diff --git a/Functions/VCS_Info/VCS_INFO_nvcsformats b/Functions/VCS_Info/VCS_INFO_nvcsformats index 203a86d..581aa5a 100644 @@ -17,15 +21,38 @@ index 203a86d..581aa5a 100644 if [[ $1 == '-preinit-' ]] ; then c='default' +-- +2.5.0 + + +From b5cea7b0719e7d1d97dc76ed3df91c865596644a Mon Sep 17 00:00:00 2001 +From: Frank Terbeck +Date: Wed, 30 Dec 2015 14:58:32 +0100 +Subject: [PATCH 2/2] 37451: vcs_info: Declare "msgs" in early context + +The parameter *is* being declared with the redefinition of the +function, but not in its initial form, which gets you a warning +about the parameter being defined globally. This fixes it. + +Upstream-commit: dab6e7c2319c0aadb39eb9cce677e0a35da8314d +Signed-off-by: Kamil Dudka +--- + Functions/VCS_Info/vcs_info | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + diff --git a/Functions/VCS_Info/vcs_info b/Functions/VCS_Info/vcs_info -index 628dde9..a44cd9e 100644 +index 628dde9..f13f6b5 100644 --- a/Functions/VCS_Info/vcs_info +++ b/Functions/VCS_Info/vcs_info -@@ -10,6 +10,7 @@ +@@ -10,7 +10,7 @@ setopt localoptions noksharrays extendedglob NO_shwordsplit local file func sys -+local -a msgs - local -a static_functions +-local -a static_functions ++local -a static_functions msgs local -i maxexports + static_functions=( +-- +2.5.0 +