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 5af66e53afb12ef82e331bbf133b524d5610c925..dee290cc7bb98bffb6d50031adbac6b7d22fe035 100644 (file)
--- 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 132cb9aeb84ad38c2cdeaa456668e540b639ec85..838ff36820ba70a12d6e1abf630347aa6cfd9e90 100644 (file)
--- 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 f8496dd135970c23398f729b21dfe5483726b5ae..260c3b1c5d43e837641ee1f6e377b845adeb9bd0 100644 (file)
--- 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 4ecf2fd6b24857f02a9e9f0cf5eb0ba32131bb35..33f5e58000c5e0761667f9658bfa38df87d1746d 100644 (file)
--- 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=