Don't delete forward across line boundaries when in overwrite mode.

Fri Mar  1 14:49:35 2002  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtktextview.c (gtk_text_view_commit_text): Don't delete
	forward across line boundaries when in overwrite mode.
	(#73145, reported by Ettore Perazzoli)

8 files changed, 87 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 9e7d3b8bdb..52912bc2a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Fri Mar  1 14:49:35 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtktextview.c (gtk_text_view_commit_text): Don't delete
+	forward across line boundaries when in overwrite mode.
+	(#73145, reported by Ettore Perazzoli)
+
+Fri Mar  1 14:47:39 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtktextview.c (gtk_text_view_commit_text): Don't
+	join up lines.
+
 Fri Mar  1 10:31:14 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtknotebook.c (gtk_notebook_reorder_child):
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 9e7d3b8bdb..52912bc2a9 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,14 @@
+Fri Mar  1 14:49:35 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtktextview.c (gtk_text_view_commit_text): Don't delete
+	forward across line boundaries when in overwrite mode.
+	(#73145, reported by Ettore Perazzoli)
+
+Fri Mar  1 14:47:39 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtktextview.c (gtk_text_view_commit_text): Don't
+	join up lines.
+
 Fri Mar  1 10:31:14 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtknotebook.c (gtk_notebook_reorder_child):
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 9e7d3b8bdb..52912bc2a9 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,14 @@
+Fri Mar  1 14:49:35 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtktextview.c (gtk_text_view_commit_text): Don't delete
+	forward across line boundaries when in overwrite mode.
+	(#73145, reported by Ettore Perazzoli)
+
+Fri Mar  1 14:47:39 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtktextview.c (gtk_text_view_commit_text): Don't
+	join up lines.
+
 Fri Mar  1 10:31:14 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtknotebook.c (gtk_notebook_reorder_child):
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 9e7d3b8bdb..52912bc2a9 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,14 @@
+Fri Mar  1 14:49:35 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtktextview.c (gtk_text_view_commit_text): Don't delete
+	forward across line boundaries when in overwrite mode.
+	(#73145, reported by Ettore Perazzoli)
+
+Fri Mar  1 14:47:39 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtktextview.c (gtk_text_view_commit_text): Don't
+	join up lines.
+
 Fri Mar  1 10:31:14 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtknotebook.c (gtk_notebook_reorder_child):
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 9e7d3b8bdb..52912bc2a9 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,14 @@
+Fri Mar  1 14:49:35 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtktextview.c (gtk_text_view_commit_text): Don't delete
+	forward across line boundaries when in overwrite mode.
+	(#73145, reported by Ettore Perazzoli)
+
+Fri Mar  1 14:47:39 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtktextview.c (gtk_text_view_commit_text): Don't
+	join up lines.
+
 Fri Mar  1 10:31:14 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtknotebook.c (gtk_notebook_reorder_child):
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 9e7d3b8bdb..52912bc2a9 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,14 @@
+Fri Mar  1 14:49:35 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtktextview.c (gtk_text_view_commit_text): Don't delete
+	forward across line boundaries when in overwrite mode.
+	(#73145, reported by Ettore Perazzoli)
+
+Fri Mar  1 14:47:39 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtktextview.c (gtk_text_view_commit_text): Don't
+	join up lines.
+
 Fri Mar  1 10:31:14 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtknotebook.c (gtk_notebook_reorder_child):
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 9e7d3b8bdb..52912bc2a9 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,14 @@
+Fri Mar  1 14:49:35 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtktextview.c (gtk_text_view_commit_text): Don't delete
+	forward across line boundaries when in overwrite mode.
+	(#73145, reported by Ettore Perazzoli)
+
+Fri Mar  1 14:47:39 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtktextview.c (gtk_text_view_commit_text): Don't
+	join up lines.
+
 Fri Mar  1 10:31:14 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtknotebook.c (gtk_notebook_reorder_child):
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index a8f7f35d4a..defa2cfb0c 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -6016,7 +6016,16 @@ gtk_text_view_commit_text (GtkTextView   *text_view,
   else
     {
       if (!had_selection && text_view->overwrite_mode)
-        gtk_text_view_delete_from_cursor (text_view, GTK_DELETE_CHARS, 1);
+	{
+	  GtkTextIter insert;
+	  
+	  gtk_text_buffer_get_iter_at_mark (get_buffer (text_view),
+					    &insert,
+					    gtk_text_buffer_get_mark (get_buffer (text_view),
+								      "insert"));
+	  if (!gtk_text_iter_ends_line (&insert))
+	    gtk_text_view_delete_from_cursor (text_view, GTK_DELETE_CHARS, 1);
+	}
       gtk_text_buffer_insert_interactive_at_cursor (get_buffer (text_view), str, -1,
                                                     text_view->editable);
     }