From: Tristan Chabredier <wwp@claws-mail.org>
Date: Fri, 1 Sep 2006 10:40:16 +0000 (+0000)
Subject: 2006-09-01 [wwp]	2.4.0cvs124
X-Git-Tag: rel_2_5_0~96
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=260ac3c73144f48b61170d2558029301d0a751d1

2006-09-01 [wwp]	2.4.0cvs124

	* commitHelper
		use CVSEDITOR env. var. is set, according to `man cvs`.
---

diff --git a/ChangeLog b/ChangeLog
index 5af66e53a..dee290cc7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-01 [wwp]	2.4.0cvs124
+
+	* commitHelper
+		use CVSEDITOR env. var. is set, according to `man cvs`.
+
 2006-09-01 [wwp]	2.4.0cvs123
 
 	* manual/advanced.xml
diff --git a/PATCHSETS b/PATCHSETS
index 132cb9aeb..838ff3682 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1815,3 +1815,4 @@
 ( cvs diff -u -r 1.1.2.23 -r 1.1.2.24 manual/advanced.xml;  ) > 2.4.0cvs121.patchset
 ( cvs diff -u -r 1.1.2.24 -r 1.1.2.25 manual/advanced.xml;  ) > 2.4.0cvs122.patchset
 ( cvs diff -u -r 1.1.2.25 -r 1.1.2.26 manual/advanced.xml;  ) > 2.4.0cvs123.patchset
+( cvs diff -u -r 1.1.2.31 -r 1.1.2.32 commitHelper;  ) > 2.4.0cvs124.patchset
diff --git a/commitHelper b/commitHelper
index f8496dd13..260c3b1c5 100644
--- a/commitHelper
+++ b/commitHelper
@@ -86,15 +86,18 @@ for line in $files; do
 done;
 patchset="$patchset ) > $nextsversion.patchset"
 
-if [ "$EDITOR" == "" ]; then
-	if [ "$VISUAL" != "" ]; then
-		EDITOR=$VISUAL
-	else
-		EDITOR=vi
+if [ "$CVSEDITOR" == "" ]; then
+	if [ "$EDITOR" == "" ]; then
+		if [ "$VISUAL" != "" ]; then
+			EDITOR=$VISUAL
+		else
+			EDITOR=vi
+		fi;
 	fi;
+else
+	EDITOR=$CVSEDITOR
 fi;
 
-
 echo -e "#please complete the changelog entry below" > /tmp/logentry
 echo -e -n $log >> /tmp/logentry
 
diff --git a/configure.ac b/configure.ac
index 4ecf2fd6b..33f5e5800 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=123
+EXTRA_VERSION=124
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=