2006-02-23 [wwp] 2.0.0cvs76

	* commitHelper
		fixed indentation from my previous commit. Fallback to VISUAL if
		EDITOR is not set (and to vi, at last resort).

diff --git a/ChangeLog b/ChangeLog
index 8c79b988eb9844b9781b8391b232f0256670c904..d73995c766cf7234f7ba9da939205fea41a31dca 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-23 [wwp]       2.0.0cvs76
+
+       * commitHelper
+               fixed indentation from my previous commit. Fallback to VISUAL if
+               EDITOR is not set (and to vi, at last resort).
+
 2006-02-23 [wwp]       2.0.0cvs75
 
        * commitHelper

diff --git a/PATCHSETS b/PATCHSETS
index 961bddcfa0299f78670ea31abfab13732b67efaf..dc3726d3f261d6bc21425d4933339f29263c16db 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1259,3 +1259,4 @@
 ( ) > 2.0.0cvs73.patchset
 ( cvs diff -u -r 1.30.2.24 -r 1.30.2.25 src/prefs_toolbar.c;  ) > 2.0.0cvs74.patchset
 ( cvs diff -u -r 1.1.2.29 -r 1.1.2.30 commitHelper;  ) > 2.0.0cvs75.patchset
+( cvs diff -u -r 1.1.2.30 -r 1.1.2.31 commitHelper;  ) > 2.0.0cvs76.patchset

diff --git a/commitHelper b/commitHelper
index 71a6a9f8e7a67e189442780bc1927f3338cc155d..f8496dd135970c23398f729b21dfe5483726b5ae 100644 (file)
--- a/commitHelper
+++ b/commitHelper
@@ -37,8 +37,7 @@ log=""
 files=`cvs diff -uN $@ 2>$tmpfile |grep ^Index`
 if [ "$files" == "" ]; then
        echo Nothing to commit\!
-       if [ -s $tmpfile ]
-       then
+       if [ -s $tmpfile ]; then
                echo See possible reason below:
                cat $tmpfile
        fi
@@ -80,15 +79,19 @@ for line in $files; do
        
        log="$log\t* $file\n"
        if [ "$version" != "0" ]; then
-       patchset="$patchset cvs diff -u -r $version -r $nextversion $file; "
+               patchset="$patchset cvs diff -u -r $version -r $nextversion $file; "
        else
-       patchset="$patchset diff -u /dev/null $file; "
+               patchset="$patchset diff -u /dev/null $file; "
        fi
 done;
 patchset="$patchset ) > $nextsversion.patchset"
 
 if [ "$EDITOR" == "" ]; then
-       EDITOR=vi
+       if [ "$VISUAL" != "" ]; then
+               EDITOR=$VISUAL
+       else
+               EDITOR=vi
+       fi;
 fi;
 
 

diff --git a/configure.ac b/configure.ac
index 73089b26d443bde8562c38bca53741fb03afbf66..80834419f5cce44ec400527903320ce0f7bc5846 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=75
+EXTRA_VERSION=76
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=