2006-03-27 [colin] 2.0.0cvs178

	* src/undo.c
		Fix undoing by blocks with spaces

diff --git a/ChangeLog b/ChangeLog
index fe0578fde160c062ec63f89632b287c0b63306b5..7fbdeb28bc45321c71c30622fd989a0455f7616f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-27 [colin]     2.0.0cvs178
+
+       * src/undo.c
+               Fix undoing by blocks with spaces
+
 2006-03-27 [colin]     2.0.0cvs177
 
        * src/textview.c

diff --git a/PATCHSETS b/PATCHSETS
index 470bf7e490de7085d641676e70d31634c13833ca..d68d6dfd8623741d5b2826ba41cf1db5e1d8ac15 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1363,3 +1363,4 @@
 ( cvs diff -u -r 1.382.2.256 -r 1.382.2.257 src/compose.c;  ) > 2.0.0cvs175.patchset
 ( cvs diff -u -r 1.395.2.188 -r 1.395.2.189 src/summaryview.c;  ) > 2.0.0cvs176.patchset
 ( cvs diff -u -r 1.96.2.104 -r 1.96.2.105 src/textview.c;  ) > 2.0.0cvs177.patchset
+( cvs diff -u -r 1.13.2.7 -r 1.13.2.8 src/undo.c;  ) > 2.0.0cvs178.patchset

diff --git a/configure.ac b/configure.ac
index 911e6169794deed33ca338dffc8837f35ceb0615..cf475289a754a4899f5f3725d42593af558dd97d 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=177
+EXTRA_VERSION=178
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/undo.c b/src/undo.c
index e5ae0676e652701b730762c3fcd1f09ad423a095..9ce75e981c1784cc6f006451de2dbbb61361737c 100644 (file)
--- a/src/undo.c
+++ b/src/undo.c
@@ -241,32 +241,17 @@ static gint undo_merge(GList *list, guint start_pos, guint end_pos,
                        return FALSE;
                } else if (last_undo->start_pos == start_pos) {
                        /* Deleted with the delete key */
-                       if (text[0] != ' ' && text[0] != '\t' &&
-                           (last_undo->text[last_undo->end_pos - last_undo->start_pos - 1] == ' ' ||
-                            last_undo->text[last_undo->end_pos - last_undo->start_pos - 1] == '\t'))
-                               checkit = FALSE;
-
                        temp_string = g_strdup_printf("%s%s", last_undo->text, text);
                        last_undo->end_pos++;
                        g_free(last_undo->text);
                        last_undo->text = temp_string;
                } else {
                        /* Deleted with the backspace key */
-                       if (text[0] != ' ' && text[0] != '\t' &&
-                           (last_undo->text[0] == ' ' ||
-                            last_undo->text[0] == '\t'))
-                               checkit = FALSE;
-
                        temp_string = g_strdup_printf("%s%s", text, last_undo->text);
                        last_undo->start_pos = start_pos;
                        g_free(last_undo->text);
                        last_undo->text = temp_string;
                }
-
-               if (!checkit) {
-                       last_undo->mergeable = FALSE;
-                       return FALSE;
-               }
        } else if (action == UNDO_ACTION_INSERT) {
                if (last_undo->end_pos != start_pos) {
                        last_undo->mergeable = FALSE;