about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2005-02-07 12:33:48 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2005-02-07 12:33:48 +0000
commit6ab69b60c93f3618aeaf7a8da18c285b423aec44 (patch)
tree80112a7d865a5059f97d6add9608ee2c30b35a8f
parent05b06b1c08263af07b2297aac0c842dafca39445 (diff)
downloadzsh-6ab69b60c93f3618aeaf7a8da18c285b423aec44.tar.gz
zsh-6ab69b60c93f3618aeaf7a8da18c285b423aec44.tar.xz
zsh-6ab69b60c93f3618aeaf7a8da18c285b423aec44.zip
20794: Change version to 4.3.0-dev-1
Don't compile in a static in init.c unless needed.
-rw-r--r--ChangeLog6
-rw-r--r--Config/version.mk4
-rw-r--r--Src/init.c3
3 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index aca8d024d..71710992c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-02-07  Peter Stephenson  <pws@csr.com>
+
+	* 20794: Config/version.mk, Src/init.c: change dev version
+	to 4.3.0-dev-1 and (unrelated) don't compile in static function
+	unless needed.
+
 2005-02-06  Peter Stephenson  <pws@pwstephenson.fsnet.co.uk>
 
 	* (cheated and guessed) 20793: Src/builtin.c, Src/exec.c,
diff --git a/Config/version.mk b/Config/version.mk
index 9acc0384c..1ba545e43 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=4.2.3-dev-1
-VERSION_DATE='January 14, 2005'
+VERSION=4.3.0-dev-1
+VERSION_DATE='February 7, 2005'
diff --git a/Src/init.c b/Src/init.c
index b7b7cfc3c..3a0b4e180 100644
--- a/Src/init.c
+++ b/Src/init.c
@@ -1173,6 +1173,8 @@ fallback_zleread(char **lp, UNUSED(char **rp), UNUSED(int ha), UNUSED(int con))
     return (unsigned char *)shingetline();
 }
 
+#ifdef UNLINKED_XMOD_zshQszle
+
 /**/
 static void
 autoload_zlesetkeymap(int mode)
@@ -1182,6 +1184,7 @@ autoload_zlesetkeymap(int mode)
     (*zlesetkeymapptr)(mode);
 }
 
+#endif
 
 /* compctl entry point pointers.  Similar to the ZLE ones. */