Index: glade2/filediff.glade

===================================================================

RCS file: /cvs/gnome/meld/glade2/filediff.glade,v

retrieving revision 1.18.2.3

diff -u -r1.18.2.3 filediff.glade

--- glade2/filediff.glade	1 Jun 2005 18:46:55 -0000	1.18.2.3

+++ glade2/filediff.glade	4 Jun 2005 23:02:37 -0000

@@ -1068,12 +1068,12 @@

 	    <widget class="GtkTextView" id="textview">

 	      <property name="visible">True</property>

 	      <property name="can_focus">True</property>

-	      <property name="editable">False</property>

+	      <property name="editable">True</property>

 	      <property name="overwrite">False</property>

 	      <property name="accepts_tab">False</property>

 	      <property name="justification">GTK_JUSTIFY_LEFT</property>

 	      <property name="wrap_mode">GTK_WRAP_NONE</property>

-	      <property name="cursor_visible">False</property>

+	      <property name="cursor_visible">True</property>

 	      <property name="pixels_above_lines">0</property>

 	      <property name="pixels_below_lines">0</property>

 	      <property name="pixels_inside_wrap">0</property>

Index: filediff.py

===================================================================

RCS file: /cvs/gnome/meld/filediff.py,v

retrieving revision 1.58.2.13

diff -u -r1.58.2.13 filediff.py

--- filediff.py	1 Jun 2005 19:35:53 -0000	1.58.2.13

+++ filediff.py	4 Jun 2005 23:02:42 -0000

@@ -811,7 +811,7 @@

         result = dialog.widget.run()

         dialog.widget.destroy()

         if result >= 0:

-            txt = "".join(lines)

+            txt = buf.get_text(buf.get_start_iter(), buf.get_end_iter(), 0)

             if result == 1: # copy

                 clip = gtk.clipboard_get()

                 clip.set_text(txt)