about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--Functions/VCS_Info/vcs_info3
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 300400632..17f7db40a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-30  Frank Terbeck  <ft@bewatermyfriend.org>
+
+	* 29526: Functions/VCS_Info/vcs_info: Set `max-exports' early
+	after certain `start-up' hooks.
+
 2011-06-28  Frank Terbeck  <ft@bewatermyfriend.org>
 
 	* Sebastian Ramacher: 29513: Completion/Debian/Command/_apt: Add
@@ -15052,5 +15057,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5382 $
+* $Revision: 1.5383 $
 *****************************************************
diff --git a/Functions/VCS_Info/vcs_info b/Functions/VCS_Info/vcs_info
index 513489b70..5a421dfed 100644
--- a/Functions/VCS_Info/vcs_info
+++ b/Functions/VCS_Info/vcs_info
@@ -70,6 +70,9 @@ vcs_info () {
     if (( retval == 1 )); then
         return 0
     elif (( retval == 2 )); then
+        # This needs `max-exports' set. We're still setting it again later
+        # for more specific contexts.
+        VCS_INFO_maxexports
         VCS_INFO_set --nvcs
         return 0
     fi