]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtktextbuffer.c
Modify the gettext translation domain for the gtk3 rename
[~andy/gtk] / gtk / gtktextbuffer.c
index 12f36373e8c6eba43190ee91f519b65a7be59ecf..dca5686e466f7897e277e04a8c3cabcb2028b260 100644 (file)
@@ -1,5 +1,6 @@
 /* GTK - The GIMP Toolkit
  * gtktextbuffer.c Copyright (C) 2000 Red Hat, Inc.
+ *                 Copyright (C) 2004 Nokia Corporation
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-
+#include "config.h"
 #include <string.h>
 #include <stdarg.h>
 
+#define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
 #include "gtkclipboard.h"
+#include "gtkdnd.h"
 #include "gtkinvisible.h"
-#include "gtksignal.h"
+#include "gtkmarshalers.h"
 #include "gtktextbuffer.h"
+#include "gtktextbufferrichtext.h"
 #include "gtktextbtree.h"
 #include "gtktextiterprivate.h"
-#include <string.h>
+#include "gtkprivate.h"
+#include "gtkintl.h"
+#include "gtkalias.h"
+
+
+#define GTK_TEXT_BUFFER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_TEXT_BUFFER, GtkTextBufferPrivate))
+
+typedef struct _GtkTextBufferPrivate GtkTextBufferPrivate;
+
+struct _GtkTextBufferPrivate
+{
+  GtkTargetList  *copy_target_list;
+  GtkTargetEntry *copy_target_entries;
+  gint            n_copy_target_entries;
+
+  GtkTargetList  *paste_target_list;
+  GtkTargetEntry *paste_target_entries;
+  gint            n_paste_target_entries;
+};
+
 
 typedef struct _ClipboardRequest ClipboardRequest;
 
@@ -60,28 +83,26 @@ enum {
   REMOVE_TAG,
   BEGIN_USER_ACTION,
   END_USER_ACTION,
+  PASTE_DONE,
   LAST_SIGNAL
 };
 
 enum {
-  ARG_0,
-  LAST_ARG
-};
+  PROP_0,
 
-enum {
-  TARGET_STRING,
-  TARGET_TEXT,
-  TARGET_COMPOUND_TEXT,
-  TARGET_UTF8_STRING,
-  TARGET_TEXT_BUFFER_CONTENTS
+  /* Construct */
+  PROP_TAG_TABLE,
+
+  /* Normal */
+  PROP_TEXT,
+  PROP_HAS_SELECTION,
+  PROP_CURSOR_POSITION,
+  PROP_COPY_TARGET_LIST,
+  PROP_PASTE_TARGET_LIST
 };
 
-static void gtk_text_buffer_init       (GtkTextBuffer      *tkxt_buffer);
-static void gtk_text_buffer_class_init (GtkTextBufferClass *klass);
 static void gtk_text_buffer_finalize   (GObject            *object);
 
-
-static void gtk_text_buffer_update_primary_selection   (GtkTextBuffer     *buffer);
 static void gtk_text_buffer_real_insert_text           (GtkTextBuffer     *buffer,
                                                         GtkTextIter       *iter,
                                                         const gchar       *text,
@@ -104,51 +125,45 @@ static void gtk_text_buffer_real_remove_tag            (GtkTextBuffer     *buffe
                                                         const GtkTextIter *start_char,
                                                         const GtkTextIter *end_char);
 static void gtk_text_buffer_real_changed               (GtkTextBuffer     *buffer);
+static void gtk_text_buffer_real_mark_set              (GtkTextBuffer     *buffer,
+                                                        const GtkTextIter *iter,
+                                                        GtkTextMark       *mark);
 
 static GtkTextBTree* get_btree (GtkTextBuffer *buffer);
 static void          free_log_attr_cache (GtkTextLogAttrCache *cache);
 
-static GtkObjectClass *parent_class = NULL;
-static guint signals[LAST_SIGNAL] = { 0 };
+static void remove_all_selection_clipboards       (GtkTextBuffer *buffer);
+static void update_selection_clipboards           (GtkTextBuffer *buffer);
 
-GType
-gtk_text_buffer_get_type (void)
-{
-  static GType our_type = 0;
+static GtkTextBuffer *create_clipboard_contents_buffer (GtkTextBuffer *buffer);
 
-  if (our_type == 0)
-    {
-      static const GTypeInfo our_info =
-      {
-        sizeof (GtkTextBufferClass),
-        (GBaseInitFunc) NULL,
-        (GBaseFinalizeFunc) NULL,
-        (GClassInitFunc) gtk_text_buffer_class_init,
-        NULL,           /* class_finalize */
-        NULL,           /* class_data */
-        sizeof (GtkTextBuffer),
-        0,              /* n_preallocs */
-        (GInstanceInitFunc) gtk_text_buffer_init
-      };
+static void gtk_text_buffer_free_target_lists     (GtkTextBuffer *buffer);
 
-      our_type = g_type_register_static (G_TYPE_OBJECT,
-                                         "GtkTextBuffer",
-                                         &our_info,
-                                         0);
-    }
+static guint signals[LAST_SIGNAL] = { 0 };
 
-  return our_type;
-}
+static void gtk_text_buffer_set_property (GObject         *object,
+                                         guint            prop_id,
+                                         const GValue    *value,
+                                         GParamSpec      *pspec);
+static void gtk_text_buffer_get_property (GObject         *object,
+                                         guint            prop_id,
+                                         GValue          *value,
+                                         GParamSpec      *pspec);
+static void gtk_text_buffer_notify       (GObject         *object,
+                                          GParamSpec      *pspec);
+
+G_DEFINE_TYPE (GtkTextBuffer, gtk_text_buffer, G_TYPE_OBJECT)
 
 static void
 gtk_text_buffer_class_init (GtkTextBufferClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-  parent_class = g_type_class_peek_parent (klass);
-
   object_class->finalize = gtk_text_buffer_finalize;
-
+  object_class->set_property = gtk_text_buffer_set_property;
+  object_class->get_property = gtk_text_buffer_get_property;
+  object_class->notify       = gtk_text_buffer_notify;
   klass->insert_text = gtk_text_buffer_real_insert_text;
   klass->insert_pixbuf = gtk_text_buffer_real_insert_pixbuf;
   klass->insert_child_anchor = gtk_text_buffer_real_insert_anchor;
@@ -156,155 +171,571 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
   klass->apply_tag = gtk_text_buffer_real_apply_tag;
   klass->remove_tag = gtk_text_buffer_real_remove_tag;
   klass->changed = gtk_text_buffer_real_changed;
-
+  klass->mark_set = gtk_text_buffer_real_mark_set;
+
+  /* Construct */
+  g_object_class_install_property (object_class,
+                                   PROP_TAG_TABLE,
+                                   g_param_spec_object ("tag-table",
+                                                        P_("Tag Table"),
+                                                        P_("Text Tag Table"),
+                                                        GTK_TYPE_TEXT_TAG_TABLE,
+                                                        GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+
+  /* Normal properties*/
+  
+  /**
+   * GtkTextBuffer:text:
+   *
+   * The text content of the buffer. Without child widgets and images,
+   * see gtk_text_buffer_get_text() for more information.
+   *
+   * Since: 2.8
+   */
+  g_object_class_install_property (object_class,
+                                   PROP_TEXT,
+                                   g_param_spec_string ("text",
+                                                        P_("Text"),
+                                                        P_("Current text of the buffer"),
+                                                       "",
+                                                        GTK_PARAM_READWRITE));
+
+  /**
+   * GtkTextBuffer:has-selection:
+   *
+   * Whether the buffer has some text currently selected.
+   *
+   * Since: 2.10
+   */
+  g_object_class_install_property (object_class,
+                                   PROP_HAS_SELECTION,
+                                   g_param_spec_boolean ("has-selection",
+                                                         P_("Has selection"),
+                                                         P_("Whether the buffer has some text currently selected"),
+                                                         FALSE,
+                                                         GTK_PARAM_READABLE));
+
+  /**
+   * GtkTextBuffer:cursor-position:
+   *
+   * The position of the insert mark (as offset from the beginning 
+   * of the buffer). It is useful for getting notified when the 
+   * cursor moves.
+   *
+   * Since: 2.10
+   */
+  g_object_class_install_property (object_class,
+                                   PROP_CURSOR_POSITION,
+                                   g_param_spec_int ("cursor-position",
+                                                     P_("Cursor position"),
+                                                     P_("The position of the insert mark (as offset from the beginning of the buffer)"),
+                                                    0, G_MAXINT, 0,
+                                                     GTK_PARAM_READABLE));
+
+  /**
+   * GtkTextBuffer:copy-target-list:
+   *
+   * The list of targets this buffer supports for clipboard copying
+   * and as DND source.
+   *
+   * Since: 2.10
+   */
+  g_object_class_install_property (object_class,
+                                   PROP_COPY_TARGET_LIST,
+                                   g_param_spec_boxed ("copy-target-list",
+                                                       P_("Copy target list"),
+                                                       P_("The list of targets this buffer supports for clipboard copying and DND source"),
+                                                       GTK_TYPE_TARGET_LIST,
+                                                       GTK_PARAM_READABLE));
+
+  /**
+   * GtkTextBuffer:paste-target-list:
+   *
+   * The list of targets this buffer supports for clipboard pasting
+   * and as DND destination.
+   *
+   * Since: 2.10
+   */
+  g_object_class_install_property (object_class,
+                                   PROP_PASTE_TARGET_LIST,
+                                   g_param_spec_boxed ("paste-target-list",
+                                                       P_("Paste target list"),
+                                                       P_("The list of targets this buffer supports for clipboard pasting and DND destination"),
+                                                       GTK_TYPE_TARGET_LIST,
+                                                       GTK_PARAM_READABLE));
+
+  /**
+   * GtkTextBuffer::insert-text:
+   * @textbuffer: the object which received the signal
+   * @location: position to insert @text in @textbuffer
+   * @text: the UTF-8 text to be inserted
+   * @len: length of the inserted text in bytes
+   * 
+   * The ::insert-text signal is emitted to insert text in a #GtkTextBuffer.
+   * Insertion actually occurs in the default handler.  
+   * 
+   * Note that if your handler runs before the default handler it must not 
+   * invalidate the @location iter (or has to revalidate it). 
+   * The default signal handler revalidates it to point to the end of the 
+   * inserted text.
+   * 
+   * See also: 
+   * gtk_text_buffer_insert(), 
+   * gtk_text_buffer_insert_range().
+   */
   signals[INSERT_TEXT] =
-    g_signal_new ("insert_text",
+    g_signal_new (I_("insert-text"),
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkTextBufferClass, insert_text),
                   NULL, NULL,
-                  gtk_marshal_VOID__BOXED_STRING_INT,
-                  GTK_TYPE_NONE,
+                  _gtk_marshal_VOID__BOXED_STRING_INT,
+                  G_TYPE_NONE,
                   3,
                   GTK_TYPE_TEXT_ITER | G_SIGNAL_TYPE_STATIC_SCOPE,
-                  GTK_TYPE_STRING | G_SIGNAL_TYPE_STATIC_SCOPE,
-                  GTK_TYPE_INT);
-
+                  G_TYPE_STRING | G_SIGNAL_TYPE_STATIC_SCOPE,
+                  G_TYPE_INT);
+
+  /**
+   * GtkTextBuffer::insert-pixbuf:
+   * @textbuffer: the object which received the signal
+   * @location: position to insert @pixbuf in @textbuffer
+   * @pixbuf: the #GdkPixbuf to be inserted
+   * 
+   * The ::insert-pixbuf signal is emitted to insert a #GdkPixbuf 
+   * in a #GtkTextBuffer. Insertion actually occurs in the default handler.
+   * 
+   * Note that if your handler runs before the default handler it must not 
+   * invalidate the @location iter (or has to revalidate it). 
+   * The default signal handler revalidates it to be placed after the 
+   * inserted @pixbuf.
+   * 
+   * See also: gtk_text_buffer_insert_pixbuf().
+   */
   signals[INSERT_PIXBUF] =
-    g_signal_new ("insert_pixbuf",
+    g_signal_new (I_("insert-pixbuf"),
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkTextBufferClass, insert_pixbuf),
                   NULL, NULL,
-                  gtk_marshal_VOID__BOXED_OBJECT,
-                  GTK_TYPE_NONE,
+                  _gtk_marshal_VOID__BOXED_OBJECT,
+                  G_TYPE_NONE,
                   2,
                   GTK_TYPE_TEXT_ITER | G_SIGNAL_TYPE_STATIC_SCOPE,
                   GDK_TYPE_PIXBUF);
 
+
+  /**
+   * GtkTextBuffer::insert-child-anchor:
+   * @textbuffer: the object which received the signal
+   * @location: position to insert @anchor in @textbuffer
+   * @anchor: the #GtkTextChildAnchor to be inserted
+   * 
+   * The ::insert-child-anchor signal is emitted to insert a
+   * #GtkTextChildAnchor in a #GtkTextBuffer.
+   * Insertion actually occurs in the default handler.
+   * 
+   * Note that if your handler runs before the default handler it must
+   * not invalidate the @location iter (or has to revalidate it). 
+   * The default signal handler revalidates it to be placed after the 
+   * inserted @anchor.
+   * 
+   * See also: gtk_text_buffer_insert_child_anchor().
+   */
   signals[INSERT_CHILD_ANCHOR] =
-    g_signal_new ("insert_child_anchor",
+    g_signal_new (I_("insert-child-anchor"),
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkTextBufferClass, insert_child_anchor),
                   NULL, NULL,
-                  gtk_marshal_VOID__BOXED_OBJECT,
-                  GTK_TYPE_NONE,
+                  _gtk_marshal_VOID__BOXED_OBJECT,
+                  G_TYPE_NONE,
                   2,
                   GTK_TYPE_TEXT_ITER | G_SIGNAL_TYPE_STATIC_SCOPE,
                   GTK_TYPE_TEXT_CHILD_ANCHOR);
   
+  /**
+   * GtkTextBuffer::delete-range:
+   * @textbuffer: the object which received the signal
+   * @start: the start of the range to be deleted
+   * @end: the end of the range to be deleted
+   * 
+   * The ::delete-range signal is emitted to delete a range 
+   * from a #GtkTextBuffer. 
+   * 
+   * Note that if your handler runs before the default handler it must not 
+   * invalidate the @start and @end iters (or has to revalidate them). 
+   * The default signal handler revalidates the @start and @end iters to 
+   * both point point to the location where text was deleted. Handlers
+   * which run after the default handler (see g_signal_connect_after())
+   * do not have access to the deleted text.
+   * 
+   * See also: gtk_text_buffer_delete().
+   */
   signals[DELETE_RANGE] =
-    g_signal_new ("delete_range",
+    g_signal_new (I_("delete-range"),
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkTextBufferClass, delete_range),
                   NULL, NULL,
-                  gtk_marshal_VOID__BOXED_BOXED,
-                  GTK_TYPE_NONE,
+                  _gtk_marshal_VOID__BOXED_BOXED,
+                  G_TYPE_NONE,
                   2,
                   GTK_TYPE_TEXT_ITER | G_SIGNAL_TYPE_STATIC_SCOPE,
                   GTK_TYPE_TEXT_ITER | G_SIGNAL_TYPE_STATIC_SCOPE);
 
+  /**
+   * GtkTextBuffer::changed:
+   * @textbuffer: the object which received the signal
+   * 
+   * The ::changed signal is emitted when the content of a #GtkTextBuffer 
+   * has changed.
+   */
   signals[CHANGED] =
-    g_signal_new ("changed",
+    g_signal_new (I_("changed"),
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,                   
                   G_STRUCT_OFFSET (GtkTextBufferClass, changed),
                   NULL, NULL,
-                  gtk_marshal_VOID__VOID,
-                  GTK_TYPE_NONE,
+                  _gtk_marshal_VOID__VOID,
+                  G_TYPE_NONE,
                   0);
 
+  /**
+   * GtkTextBuffer::modified-changed:
+   * @textbuffer: the object which received the signal
+   * 
+   * The ::modified-changed signal is emitted when the modified bit of a 
+   * #GtkTextBuffer flips.
+   * 
+   * See also:
+   * gtk_text_buffer_set_modified().
+   */
   signals[MODIFIED_CHANGED] =
-    g_signal_new ("modified_changed",
+    g_signal_new (I_("modified-changed"),
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkTextBufferClass, modified_changed),
                   NULL, NULL,
-                  gtk_marshal_VOID__VOID,
-                  GTK_TYPE_NONE,
+                  _gtk_marshal_VOID__VOID,
+                  G_TYPE_NONE,
                   0);
 
+  /**
+   * GtkTextBuffer::mark-set:
+   * @textbuffer: the object which received the signal
+   * @location: The location of @mark in @textbuffer
+   * @mark: The mark that is set
+   * 
+   * The ::mark-set signal is emitted as notification
+   * after a #GtkTextMark is set.
+   * 
+   * See also: 
+   * gtk_text_buffer_create_mark(),
+   * gtk_text_buffer_move_mark().
+   */
   signals[MARK_SET] =
-    g_signal_new ("mark_set",
+    g_signal_new (I_("mark-set"),
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,                   
                   G_STRUCT_OFFSET (GtkTextBufferClass, mark_set),
                   NULL, NULL,
-                  gtk_marshal_VOID__BOXED_OBJECT,
-                  GTK_TYPE_NONE,
+                  _gtk_marshal_VOID__BOXED_OBJECT,
+                  G_TYPE_NONE,
                   2,
                   GTK_TYPE_TEXT_ITER,
                   GTK_TYPE_TEXT_MARK);
 
+  /**
+   * GtkTextBuffer::mark-deleted:
+   * @textbuffer: the object which received the signal
+   * @mark: The mark that was deleted
+   * 
+   * The ::mark-deleted signal is emitted as notification
+   * after a #GtkTextMark is deleted. 
+   * 
+   * See also:
+   * gtk_text_buffer_delete_mark().
+   */
   signals[MARK_DELETED] =
-    g_signal_new ("mark_deleted",
+    g_signal_new (I_("mark-deleted"),
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,                   
                   G_STRUCT_OFFSET (GtkTextBufferClass, mark_deleted),
                   NULL, NULL,
-                  gtk_marshal_VOID__OBJECT,
-                  GTK_TYPE_NONE,
+                  _gtk_marshal_VOID__OBJECT,
+                  G_TYPE_NONE,
                   1,
                   GTK_TYPE_TEXT_MARK);
-  
+
+   /**
+   * GtkTextBuffer::apply-tag:
+   * @textbuffer: the object which received the signal
+   * @tag: the applied tag
+   * @start: the start of the range the tag is applied to
+   * @end: the end of the range the tag is applied to
+   * 
+   * The ::apply-tag signal is emitted to apply a tag to a
+   * range of text in a #GtkTextBuffer. 
+   * Applying actually occurs in the default handler.
+   * 
+   * Note that if your handler runs before the default handler it must not 
+   * invalidate the @start and @end iters (or has to revalidate them). 
+   * 
+   * See also: 
+   * gtk_text_buffer_apply_tag(),
+   * gtk_text_buffer_insert_with_tags(),
+   * gtk_text_buffer_insert_range().
+   */ 
   signals[APPLY_TAG] =
-    g_signal_new ("apply_tag",
+    g_signal_new (I_("apply-tag"),
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkTextBufferClass, apply_tag),
                   NULL, NULL,
-                  gtk_marshal_VOID__OBJECT_BOXED_BOXED,
-                  GTK_TYPE_NONE,
+                  _gtk_marshal_VOID__OBJECT_BOXED_BOXED,
+                  G_TYPE_NONE,
                   3,
                   GTK_TYPE_TEXT_TAG,
                   GTK_TYPE_TEXT_ITER,
                   GTK_TYPE_TEXT_ITER);
 
+
+   /**
+   * GtkTextBuffer::remove-tag:
+   * @textbuffer: the object which received the signal
+   * @tag: the tag to be removed
+   * @start: the start of the range the tag is removed from
+   * @end: the end of the range the tag is removed from
+   * 
+   * The ::remove-tag signal is emitted to remove all occurrences of @tag from
+   * a range of text in a #GtkTextBuffer. 
+   * Removal actually occurs in the default handler.
+   * 
+   * Note that if your handler runs before the default handler it must not 
+   * invalidate the @start and @end iters (or has to revalidate them). 
+   * 
+   * See also: 
+   * gtk_text_buffer_remove_tag(). 
+   */ 
   signals[REMOVE_TAG] =
-    g_signal_new ("remove_tag",
+    g_signal_new (I_("remove-tag"),
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkTextBufferClass, remove_tag),
                   NULL, NULL,
-                  gtk_marshal_VOID__OBJECT_BOXED_BOXED,
-                  GTK_TYPE_NONE,
+                  _gtk_marshal_VOID__OBJECT_BOXED_BOXED,
+                  G_TYPE_NONE,
                   3,
                   GTK_TYPE_TEXT_TAG,
                   GTK_TYPE_TEXT_ITER,
                   GTK_TYPE_TEXT_ITER);
 
+   /**
+   * GtkTextBuffer::begin-user-action:
+   * @textbuffer: the object which received the signal
+   * 
+   * The ::begin-user-action signal is emitted at the beginning of a single
+   * user-visible operation on a #GtkTextBuffer.
+   * 
+   * See also: 
+   * gtk_text_buffer_begin_user_action(),
+   * gtk_text_buffer_insert_interactive(),
+   * gtk_text_buffer_insert_range_interactive(),
+   * gtk_text_buffer_delete_interactive(),
+   * gtk_text_buffer_backspace(),
+   * gtk_text_buffer_delete_selection().
+   */ 
   signals[BEGIN_USER_ACTION] =
-    g_signal_new ("begin_user_action",
+    g_signal_new (I_("begin-user-action"),
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,                   
                   G_STRUCT_OFFSET (GtkTextBufferClass, begin_user_action),
                   NULL, NULL,
-                  gtk_marshal_VOID__VOID,
-                  GTK_TYPE_NONE,
+                  _gtk_marshal_VOID__VOID,
+                  G_TYPE_NONE,
                   0);
 
+   /**
+   * GtkTextBuffer::end-user-action:
+   * @textbuffer: the object which received the signal
+   * 
+   * The ::end-user-action signal is emitted at the end of a single
+   * user-visible operation on the #GtkTextBuffer.
+   * 
+   * See also: 
+   * gtk_text_buffer_end_user_action(),
+   * gtk_text_buffer_insert_interactive(),
+   * gtk_text_buffer_insert_range_interactive(),
+   * gtk_text_buffer_delete_interactive(),
+   * gtk_text_buffer_backspace(),
+   * gtk_text_buffer_delete_selection(),
+   * gtk_text_buffer_backspace().
+   */ 
   signals[END_USER_ACTION] =
-    g_signal_new ("end_user_action",
+    g_signal_new (I_("end-user-action"),
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,                   
                   G_STRUCT_OFFSET (GtkTextBufferClass, end_user_action),
                   NULL, NULL,
-                  gtk_marshal_VOID__VOID,
-                  GTK_TYPE_NONE,
-                  0);  
+                  _gtk_marshal_VOID__VOID,
+                  G_TYPE_NONE,
+                  0);
+
+   /**
+   * GtkTextBuffer::paste-done:
+   * @textbuffer: the object which received the signal
+   * 
+   * The paste-done signal is emitted after paste operation has been completed.
+   * This is useful to properly scroll the view to the end of the pasted text.
+   * See gtk_text_buffer_paste_clipboard() for more details.
+   * 
+   * Since: 2.16
+   */ 
+  signals[PASTE_DONE] =
+    g_signal_new (I_("paste-done"),
+                  G_OBJECT_CLASS_TYPE (object_class),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (GtkTextBufferClass, paste_done),
+                  NULL, NULL,
+                  _gtk_marshal_VOID__OBJECT,
+                  G_TYPE_NONE,
+                  1,
+                  GTK_TYPE_CLIPBOARD);
+
+  g_type_class_add_private (object_class, sizeof (GtkTextBufferPrivate));
 }
 
-void
+static void
 gtk_text_buffer_init (GtkTextBuffer *buffer)
 {
-  buffer->clipboard_contents = NULL;
+  buffer->clipboard_contents_buffers = NULL;
+  buffer->tag_table = NULL;
+
+  /* allow copying of arbiatray stuff in the internal rich text format */
+  gtk_text_buffer_register_serialize_tagset (buffer, NULL);
+}
+
+static void
+set_table (GtkTextBuffer *buffer, GtkTextTagTable *table)
+{
+  g_return_if_fail (buffer->tag_table == NULL);
+
+  if (table)
+    {
+      buffer->tag_table = table;
+      g_object_ref (buffer->tag_table);
+      _gtk_text_tag_table_add_buffer (table, buffer);
+    }
+}
+
+static GtkTextTagTable*
+get_table (GtkTextBuffer *buffer)
+{
+  if (buffer->tag_table == NULL)
+    {
+      buffer->tag_table = gtk_text_tag_table_new ();
+      _gtk_text_tag_table_add_buffer (buffer->tag_table, buffer);
+    }
+
+  return buffer->tag_table;
+}
+
+static void
+gtk_text_buffer_set_property (GObject         *object,
+                              guint            prop_id,
+                              const GValue    *value,
+                              GParamSpec      *pspec)
+{
+  GtkTextBuffer *text_buffer;
+
+  text_buffer = GTK_TEXT_BUFFER (object);
+
+  switch (prop_id)
+    {
+    case PROP_TAG_TABLE:
+      set_table (text_buffer, g_value_get_object (value));
+      break;
+
+    case PROP_TEXT:
+      gtk_text_buffer_set_text (text_buffer,
+                               g_value_get_string (value), -1);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+gtk_text_buffer_get_property (GObject         *object,
+                              guint            prop_id,
+                              GValue          *value,
+                              GParamSpec      *pspec)
+{
+  GtkTextBuffer *text_buffer;
+  GtkTextIter iter;
+
+  text_buffer = GTK_TEXT_BUFFER (object);
+
+  switch (prop_id)
+    {
+    case PROP_TAG_TABLE:
+      g_value_set_object (value, get_table (text_buffer));
+      break;
+
+    case PROP_TEXT:
+      {
+        GtkTextIter start, end;
+
+        gtk_text_buffer_get_start_iter (text_buffer, &start);
+        gtk_text_buffer_get_end_iter (text_buffer, &end);
+
+        g_value_take_string (value,
+                            gtk_text_buffer_get_text (text_buffer,
+                                                      &start, &end, FALSE));
+        break;
+      }
+
+    case PROP_HAS_SELECTION:
+      g_value_set_boolean (value, text_buffer->has_selection);
+      break;
+
+    case PROP_CURSOR_POSITION:
+      gtk_text_buffer_get_iter_at_mark (text_buffer, &iter, 
+                                       gtk_text_buffer_get_insert (text_buffer));
+      g_value_set_int (value, gtk_text_iter_get_offset (&iter));
+      break;
+
+    case PROP_COPY_TARGET_LIST:
+      g_value_set_boxed (value, gtk_text_buffer_get_copy_target_list (text_buffer));
+      break;
+
+    case PROP_PASTE_TARGET_LIST:
+      g_value_set_boxed (value, gtk_text_buffer_get_paste_target_list (text_buffer));
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+gtk_text_buffer_notify (GObject    *object,
+                        GParamSpec *pspec)
+{
+  if (!strcmp (pspec->name, "copy-target-list") ||
+      !strcmp (pspec->name, "paste-target-list"))
+    {
+      gtk_text_buffer_free_target_lists (GTK_TEXT_BUFFER (object));
+    }
 }
 
 /**
  * gtk_text_buffer_new:
- * @table: a tag table, or NULL to create a new one
+ * @table: (allow-none): a tag table, or %NULL to create a new one
  *
  * Creates a new text buffer.
  *
@@ -315,15 +746,8 @@ gtk_text_buffer_new (GtkTextTagTable *table)
 {
   GtkTextBuffer *text_buffer;
 
-  text_buffer = GTK_TEXT_BUFFER (g_object_new (gtk_text_buffer_get_type (), NULL));
-
-  if (table)
-    {
-      text_buffer->tag_table = table;
+  text_buffer = g_object_new (GTK_TYPE_TEXT_BUFFER, "tag-table", table, NULL);
 
-      g_object_ref (G_OBJECT (text_buffer->tag_table));
-    }
-  
   return text_buffer;
 }
 
@@ -334,15 +758,12 @@ gtk_text_buffer_finalize (GObject *object)
 
   buffer = GTK_TEXT_BUFFER (object);
 
-  if (buffer->clipboard_contents)
-    {
-      g_object_unref (G_OBJECT (buffer->clipboard_contents));
-      buffer->clipboard_contents = NULL;
-    }
-  
+  remove_all_selection_clipboards (buffer);
+
   if (buffer->tag_table)
     {
-      g_object_unref (G_OBJECT (buffer->tag_table));
+      _gtk_text_tag_table_remove_buffer (buffer->tag_table, buffer);
+      g_object_unref (buffer->tag_table);
       buffer->tag_table = NULL;
     }
 
@@ -356,17 +777,10 @@ gtk_text_buffer_finalize (GObject *object)
     free_log_attr_cache (buffer->log_attr_cache);
 
   buffer->log_attr_cache = NULL;
-  
-  G_OBJECT_CLASS (parent_class)->finalize (object);
-}
 
-static GtkTextTagTable*
-get_table (GtkTextBuffer *buffer)
-{
-  if (buffer->tag_table == NULL)
-    buffer->tag_table = gtk_text_tag_table_new ();
+  gtk_text_buffer_free_target_lists (buffer);
 
-  return buffer->tag_table;
+  G_OBJECT_CLASS (gtk_text_buffer_parent_class)->finalize (object);
 }
 
 static GtkTextBTree*
@@ -374,7 +788,7 @@ get_btree (GtkTextBuffer *buffer)
 {
   if (buffer->btree == NULL)
     buffer->btree = _gtk_text_btree_new (gtk_text_buffer_get_tag_table (buffer),
-                                        buffer);
+                                         buffer);
 
   return buffer->btree;
 }
@@ -391,10 +805,10 @@ _gtk_text_buffer_get_btree (GtkTextBuffer *buffer)
  *
  * Get the #GtkTextTagTable associated with this buffer.
  *
- * Return value: the buffer's tag table
+ * Return value: (transfer none): the buffer's tag table
  **/
 GtkTextTagTable*
-gtk_text_buffer_get_tag_table (GtkTextBuffer  *buffer)
+gtk_text_buffer_get_tag_table (GtkTextBuffer *buffer)
 {
   g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), NULL);
 
@@ -407,11 +821,8 @@ gtk_text_buffer_get_tag_table (GtkTextBuffer  *buffer)
  * @text: UTF-8 text to insert
  * @len: length of @text in bytes
  *
- * Deletes current contents of @buffer, and inserts @text instead.  If
- * @text doesn't end with a newline, a newline is added;
- * #GtkTextBuffer contents must always end with a newline. If @text
- * ends with a newline, the new buffer contents will be exactly
- * @text. If @len is -1, @text must be nul-terminated.
+ * Deletes current contents of @buffer, and inserts @text instead. If
+ * @len is -1, @text must be nul-terminated. @text must be valid UTF-8.
  **/
 void
 gtk_text_buffer_set_text (GtkTextBuffer *buffer,
@@ -426,12 +837,6 @@ gtk_text_buffer_set_text (GtkTextBuffer *buffer,
   if (len < 0)
     len = strlen (text);
 
-  /* Chop newline, since the buffer will already have one
-   * in it.
-   */
-  if (len > 0 && text[len-1] == '\n')
-    len -= 1;
-
   gtk_text_buffer_get_bounds (buffer, &start, &end);
 
   gtk_text_buffer_delete (buffer, &start, &end);
@@ -441,25 +846,29 @@ gtk_text_buffer_set_text (GtkTextBuffer *buffer,
       gtk_text_buffer_get_iter_at_offset (buffer, &start, 0);
       gtk_text_buffer_insert (buffer, &start, text, len);
     }
+  
+  g_object_notify (G_OBJECT (buffer), "text");
 }
 
+
 /*
  * Insertion
  */
 
 static void
-
 gtk_text_buffer_real_insert_text (GtkTextBuffer *buffer,
-                                  GtkTextIter *iter,
-                                  const gchar *text,
-                                  gint len)
+                                  GtkTextIter   *iter,
+                                  const gchar   *text,
+                                  gint           len)
 {
   g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
   g_return_if_fail (iter != NULL);
   
   _gtk_text_btree_insert (iter, text, len);
 
-  g_signal_emit (G_OBJECT (buffer), signals[CHANGED], 0);
+  g_signal_emit (buffer, signals[CHANGED], 0);
+  g_object_notify (G_OBJECT (buffer), "cursor-position");
 }
 
 static void
@@ -479,7 +888,7 @@ gtk_text_buffer_emit_insert (GtkTextBuffer *buffer,
   
   if (len > 0)
     {
-      g_signal_emit (G_OBJECT (buffer), signals[INSERT_TEXT], 0,
+      g_signal_emit (buffer, signals[INSERT_TEXT], 0,
                      iter, text, len);
     }
 }
@@ -493,18 +902,17 @@ gtk_text_buffer_emit_insert (GtkTextBuffer *buffer,
  *
  * Inserts @len bytes of @text at position @iter.  If @len is -1,
  * @text must be nul-terminated and will be inserted in its
- * entirety. Emits the "insert_text" signal; insertion actually occurs
+ * entirety. Emits the "insert-text" signal; insertion actually occurs
  * in the default handler for the signal. @iter is invalidated when
  * insertion occurs (because the buffer contents change), but the
  * default signal handler revalidates it to point to the end of the
  * inserted text.
- *
  **/
 void
 gtk_text_buffer_insert (GtkTextBuffer *buffer,
-                        GtkTextIter *iter,
-                        const gchar *text,
-                        gint len)
+                        GtkTextIter   *iter,
+                        const gchar   *text,
+                        gint           len)
 {
   g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
   g_return_if_fail (iter != NULL);
@@ -520,13 +928,13 @@ gtk_text_buffer_insert (GtkTextBuffer *buffer,
  * @text: some text in UTF-8 format
  * @len: length of text, in bytes
  *
- * Simply calls gtk_text_buffer_insert (), using the current
+ * Simply calls gtk_text_buffer_insert(), using the current
  * cursor position as the insertion point.
  **/
 void
 gtk_text_buffer_insert_at_cursor (GtkTextBuffer *buffer,
-                                  const gchar *text,
-                                  gint len)
+                                  const gchar   *text,
+                                  gint           len)
 {
   GtkTextIter iter;
 
@@ -534,8 +942,7 @@ gtk_text_buffer_insert_at_cursor (GtkTextBuffer *buffer,
   g_return_if_fail (text != NULL);
 
   gtk_text_buffer_get_iter_at_mark (buffer, &iter,
-                                    gtk_text_buffer_get_mark (buffer,
-                                                              "insert"));
+                                    gtk_text_buffer_get_insert (buffer));
 
   gtk_text_buffer_insert (buffer, &iter, text, len);
 }
@@ -548,8 +955,8 @@ gtk_text_buffer_insert_at_cursor (GtkTextBuffer *buffer,
  * @len: length of text in bytes, or -1
  * @default_editable: default editability of buffer
  *
- * Like gtk_text_buffer_insert (), but the insertion will not occur if
- * @iter is at a non-editable location in the buffer.  Usually you
+ * Like gtk_text_buffer_insert(), but the insertion will not occur if
+ * @iter is at a non-editable location in the buffer. Usually you
  * want to prevent insertions at ineditable locations if the insertion
  * results from a user action (is interactive).
  *
@@ -570,7 +977,7 @@ gtk_text_buffer_insert_interactive (GtkTextBuffer *buffer,
   g_return_val_if_fail (text != NULL, FALSE);
   g_return_val_if_fail (gtk_text_iter_get_buffer (iter) == buffer, FALSE);
 
-  if (gtk_text_iter_editable (iter, default_editable))
+  if (gtk_text_iter_can_insert (iter, default_editable))
     {
       gtk_text_buffer_begin_user_action (buffer);
       gtk_text_buffer_emit_insert (buffer, iter, text, len);
@@ -588,7 +995,7 @@ gtk_text_buffer_insert_interactive (GtkTextBuffer *buffer,
  * @len: length of text in bytes, or -1
  * @default_editable: default editability of buffer
  *
- * Calls gtk_text_buffer_insert_interactive () at the cursor
+ * Calls gtk_text_buffer_insert_interactive() at the cursor
  * position.
  *
  * @default_editable indicates the editability of text that doesn't
@@ -609,8 +1016,7 @@ gtk_text_buffer_insert_interactive_at_cursor (GtkTextBuffer *buffer,
   g_return_val_if_fail (text != NULL, FALSE);
 
   gtk_text_buffer_get_iter_at_mark (buffer, &iter,
-                                    gtk_text_buffer_get_mark (buffer,
-                                                              "insert"));
+                                    gtk_text_buffer_get_insert (buffer));
 
   return gtk_text_buffer_insert_interactive (buffer, &iter, text, len,
                                              default_editable);
@@ -661,24 +1067,24 @@ save_range (GtkTextIter *range_start,
   r = g_new (Range, 1);
 
   r->buffer = gtk_text_iter_get_buffer (range_start);
-  g_object_ref (G_OBJECT (r->buffer));
+  g_object_ref (r->buffer);
   
   r->start_mark = 
     gtk_text_buffer_create_mark (gtk_text_iter_get_buffer (range_start),
                                  NULL,
                                  range_start,
-                                 TRUE);
+                                 FALSE);
   r->end_mark = 
     gtk_text_buffer_create_mark (gtk_text_iter_get_buffer (range_start),
                                  NULL,
                                  range_end,
-                                 FALSE);
+                                 TRUE);
 
   r->whole_end_mark = 
     gtk_text_buffer_create_mark (gtk_text_iter_get_buffer (range_start),
                                  NULL,
                                  whole_end,
-                                 FALSE);
+                                 TRUE);
 
   r->range_start = range_start;
   r->range_end = range_end;
@@ -700,13 +1106,24 @@ restore_range (Range *r)
       
   gtk_text_buffer_get_iter_at_mark (r->buffer,
                                     r->whole_end,
-                                    r->whole_end_mark);
-      
+                                    r->whole_end_mark);  
+  
   gtk_text_buffer_delete_mark (r->buffer, r->start_mark);
   gtk_text_buffer_delete_mark (r->buffer, r->end_mark);
   gtk_text_buffer_delete_mark (r->buffer, r->whole_end_mark);
 
-  g_object_unref (G_OBJECT (r->buffer));
+  /* Due to the gravities on the marks, the ordering could have
+   * gotten mangled; we switch to an empty range in that
+   * case
+   */
+  
+  if (gtk_text_iter_compare (r->range_start, r->range_end) > 0)
+    *r->range_start = *r->range_end;
+
+  if (gtk_text_iter_compare (r->range_end, r->whole_end) > 0)
+    *r->range_end = *r->whole_end;
+  
+  g_object_unref (r->buffer);
   g_free (r); 
 }
 
@@ -720,7 +1137,6 @@ insert_range_untagged (GtkTextBuffer     *buffer,
   GtkTextIter range_start;
   GtkTextIter range_end;
   GtkTextIter start, end;
-  GtkTextBuffer *src_buffer;
   Range *r;
   
   if (gtk_text_iter_equal (orig_start, orig_end))
@@ -729,8 +1145,6 @@ insert_range_untagged (GtkTextBuffer     *buffer,
   start = *orig_start;
   end = *orig_end;
   
-  src_buffer = gtk_text_iter_get_buffer (&start);
-  
   range_start = start;
   range_end = start;
   
@@ -823,11 +1237,11 @@ insert_range_untagged (GtkTextBuffer     *buffer,
 }
 
 static void
-gtk_text_buffer_real_insert_range (GtkTextBuffer     *buffer,
-                                   GtkTextIter       *iter,
-                                   const GtkTextIter *orig_start,
-                                   const GtkTextIter *orig_end,
-                                   gboolean           interactive)
+insert_range_not_inside_self (GtkTextBuffer     *buffer,
+                              GtkTextIter       *iter,
+                              const GtkTextIter *orig_start,
+                              const GtkTextIter *orig_end,
+                              gboolean           interactive)
 {
   /* Find each range of uniformly-tagged text, insert it,
    * then apply the tags.
@@ -836,28 +1250,22 @@ gtk_text_buffer_real_insert_range (GtkTextBuffer     *buffer,
   GtkTextIter end = *orig_end;
   GtkTextIter range_start;
   GtkTextIter range_end;
-  GtkTextBuffer *src_buffer;
-  Range *r;
   
   if (gtk_text_iter_equal (orig_start, orig_end))
     return;
-
-  if (interactive)
-    gtk_text_buffer_begin_user_action (buffer);
-  
-  src_buffer = gtk_text_iter_get_buffer (orig_start);
   
   gtk_text_iter_order (&start, &end);
 
   range_start = start;
-  range_end = start;
-
+  range_end = start;  
+  
   while (TRUE)
     {
       gint start_offset;
       GtkTextIter start_iter;
       GSList *tags;
       GSList *tmp_list;
+      Range *r;
       
       if (gtk_text_iter_equal (&range_start, &end))
         break; /* All done */
@@ -901,7 +1309,64 @@ gtk_text_buffer_real_insert_range (GtkTextBuffer     *buffer,
 
       range_start = range_end;
     }
+}
+
+static void
+gtk_text_buffer_real_insert_range (GtkTextBuffer     *buffer,
+                                   GtkTextIter       *iter,
+                                   const GtkTextIter *orig_start,
+                                   const GtkTextIter *orig_end,
+                                   gboolean           interactive)
+{
+  GtkTextBuffer *src_buffer;
+  
+  /* Find each range of uniformly-tagged text, insert it,
+   * then apply the tags.
+   */  
+  if (gtk_text_iter_equal (orig_start, orig_end))
+    return;
+
+  if (interactive)
+    gtk_text_buffer_begin_user_action (buffer);
+  
+  src_buffer = gtk_text_iter_get_buffer (orig_start);
+  
+  if (gtk_text_iter_get_buffer (iter) != src_buffer ||
+      !gtk_text_iter_in_range (iter, orig_start, orig_end))
+    {
+      insert_range_not_inside_self (buffer, iter, orig_start, orig_end, interactive);
+    }
+  else
+    {
+      /* If you insert a range into itself, it could loop infinitely
+       * because the region being copied keeps growing as we insert. So
+       * we have to separately copy the range before and after
+       * the insertion point.
+       */
+      GtkTextIter start = *orig_start;
+      GtkTextIter end = *orig_end;
+      GtkTextIter range_start;
+      GtkTextIter range_end;
+      Range *first_half;
+      Range *second_half;
+
+      gtk_text_iter_order (&start, &end);
+      
+      range_start = start;
+      range_end = *iter;
+      first_half = save_range (&range_start, &range_end, &end);
+
+      range_start = *iter;
+      range_end = end;
+      second_half = save_range (&range_start, &range_end, &end);
 
+      restore_range (first_half);
+      insert_range_not_inside_self (buffer, iter, &range_start, &range_end, interactive);
+
+      restore_range (second_half);
+      insert_range_not_inside_self (buffer, iter, &range_start, &range_end, interactive);
+    }
+  
   if (interactive)
     gtk_text_buffer_end_user_action (buffer);
 }
@@ -973,8 +1438,7 @@ gtk_text_buffer_insert_range_interactive (GtkTextBuffer     *buffer,
   g_return_val_if_fail (gtk_text_iter_get_buffer (start)->tag_table ==
                         buffer->tag_table, FALSE);
 
-
-  if (gtk_text_iter_editable (iter, default_editable))
+  if (gtk_text_iter_can_insert (iter, default_editable))
     {
       gtk_text_buffer_real_insert_range (buffer, iter, start, end, TRUE);
       return TRUE;
@@ -994,9 +1458,9 @@ gtk_text_buffer_insert_range_interactive (GtkTextBuffer     *buffer,
  *
  * Inserts @text into @buffer at @iter, applying the list of tags to
  * the newly-inserted text. The last tag specified must be NULL to
- * terminate the list. Equivalent to calling gtk_text_buffer_insert (),
- * then gtk_text_buffer_apply_tag () on the inserted text;
- * gtk_text_buffer_insert_with_tags () is just a convenience function.
+ * terminate the list. Equivalent to calling gtk_text_buffer_insert(),
+ * then gtk_text_buffer_apply_tag() on the inserted text;
+ * gtk_text_buffer_insert_with_tags() is just a convenience function.
  **/
 void
 gtk_text_buffer_insert_with_tags (GtkTextBuffer *buffer,
@@ -1046,7 +1510,7 @@ gtk_text_buffer_insert_with_tags (GtkTextBuffer *buffer,
  * @first_tag_name: name of a tag to apply to @text
  * @Varargs: more tag names
  *
- * Same as gtk_text_buffer_insert_with_tags (), but allows you
+ * Same as gtk_text_buffer_insert_with_tags(), but allows you
  * to pass in tag names instead of tag objects.
  **/
 void
@@ -1088,6 +1552,7 @@ gtk_text_buffer_insert_with_tags_by_name  (GtkTextBuffer *buffer,
       if (tag == NULL)
         {
           g_warning ("%s: no tag with name '%s'!", G_STRLOC, tag_name);
+          va_end (args);
           return;
         }
 
@@ -1109,6 +1574,8 @@ gtk_text_buffer_real_delete_range (GtkTextBuffer *buffer,
                                    GtkTextIter   *start,
                                    GtkTextIter   *end)
 {
+  gboolean has_selection;
+
   g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
   g_return_if_fail (start != NULL);
   g_return_if_fail (end != NULL);
@@ -1116,9 +1583,17 @@ gtk_text_buffer_real_delete_range (GtkTextBuffer *buffer,
   _gtk_text_btree_delete (start, end);
 
   /* may have deleted the selection... */
-  gtk_text_buffer_update_primary_selection (buffer);
+  update_selection_clipboards (buffer);
+
+  has_selection = gtk_text_buffer_get_selection_bounds (buffer, NULL, NULL);
+  if (has_selection != buffer->has_selection)
+    {
+      buffer->has_selection = has_selection;
+      g_object_notify (G_OBJECT (buffer), "has-selection");
+    }
 
-  g_signal_emit (G_OBJECT (buffer), signals[CHANGED], 0);
+  g_signal_emit (buffer, signals[CHANGED], 0);
+  g_object_notify (G_OBJECT (buffer), "cursor-position");
 }
 
 static void
@@ -1135,15 +1610,7 @@ gtk_text_buffer_emit_delete (GtkTextBuffer *buffer,
 
   gtk_text_iter_order (start, end);
 
-  /* Somewhat annoyingly, if you try to delete the final newline
-   * the BTree will put it back; which means you can't deduce the
-   * final contents of the buffer purely by monitoring insert/delete
-   * signals on the buffer. But if you delete the final newline, any
-   * tags on the newline will go away, oddly. See comment in
-   * gtktextbtree.c. This is all sort of annoying, but really hard
-   * to fix.
-   */
-  g_signal_emit (G_OBJECT (buffer),
+  g_signal_emit (buffer,
                  signals[DELETE_RANGE],
                  0,
                  start, end);
@@ -1156,18 +1623,12 @@ gtk_text_buffer_emit_delete (GtkTextBuffer *buffer,
  * @end: another position in @buffer
  *
  * Deletes text between @start and @end. The order of @start and @end
- * is not actually relevant; gtk_text_buffer_delete () will reorder
- * them. This function actually emits the "delete_range" signal, and
+ * is not actually relevant; gtk_text_buffer_delete() will reorder
+ * them. This function actually emits the "delete-range" signal, and
  * the default handler of that signal deletes the text. Because the
  * buffer is modified, all outstanding iterators become invalid after
  * calling this function; however, the @start and @end will be
  * re-initialized to point to the location where text was deleted.
- *
- * Note that the final newline in the buffer may not be deleted; a
- * #GtkTextBuffer always contains at least one newline.  You can
- * safely include the final newline in the range [@start,@end) but it
- * won't be affected by the deletion.
- *
  **/
 void
 gtk_text_buffer_delete (GtkTextBuffer *buffer,
@@ -1191,7 +1652,7 @@ gtk_text_buffer_delete (GtkTextBuffer *buffer,
  * @default_editable: whether the buffer is editable by default
  *
  * Deletes all <emphasis>editable</emphasis> text in the given range.
- * Calls gtk_text_buffer_delete () for each editable sub-range of
+ * Calls gtk_text_buffer_delete() for each editable sub-range of
  * [@start,@end). @start and @end are revalidated to point to
  * the location of the last deleted range, or left untouched if
  * no text was deleted.
@@ -1227,7 +1688,8 @@ gtk_text_buffer_delete_interactive (GtkTextBuffer *buffer,
                                             start_iter, TRUE);
   end_mark = gtk_text_buffer_create_mark (buffer, NULL,
                                           end_iter, FALSE);
-  iter = *start_iter;
+
+  gtk_text_buffer_get_iter_at_mark (buffer, &iter, start_mark);
 
   current_state = gtk_text_iter_editable (&iter, default_editable);
 
@@ -1284,7 +1746,13 @@ gtk_text_buffer_delete_interactive (GtkTextBuffer *buffer,
 
           gtk_text_buffer_emit_delete (buffer, &start, &iter);
 
-          current_state = FALSE;
+         /* It's more robust to ask for the state again then to assume that
+          * we're on the next not-editable segment. We don't know what the
+          * ::delete-range handler did.... maybe it deleted the following
+           * not-editable segment because it was associated with the editable
+           * segment.
+          */
+         current_state = gtk_text_iter_editable (&iter, default_editable);
           deleted_stuff = TRUE;
 
           /* revalidate user's iterators. */
@@ -1299,9 +1767,7 @@ gtk_text_buffer_delete_interactive (GtkTextBuffer *buffer,
 
           g_assert (!current_state && new_state);
 
-          gtk_text_buffer_move_mark (buffer, start_mark,
-                                     &iter);
-
+          gtk_text_buffer_move_mark (buffer, start_mark, &iter);
 
           current_state = TRUE;
         }
@@ -1310,7 +1776,6 @@ gtk_text_buffer_delete_interactive (GtkTextBuffer *buffer,
         break;
     }
 
-
   gtk_text_buffer_delete_mark (buffer, start_mark);
   gtk_text_buffer_delete_mark (buffer, end_mark);
 
@@ -1332,19 +1797,19 @@ gtk_text_buffer_delete_interactive (GtkTextBuffer *buffer,
  *
  * Returns the text in the range [@start,@end). Excludes undisplayed
  * text (text marked with tags that set the invisibility attribute) if
- * @include_hidden_chars is FALSE. Does not include characters
+ * @include_hidden_chars is %FALSE. Does not include characters
  * representing embedded images, so byte and character indexes into
  * the returned string do <emphasis>not</emphasis> correspond to byte
  * and character indexes into the buffer. Contrast with
- * gtk_text_buffer_get_slice ().
+ * gtk_text_buffer_get_slice().
  *
  * Return value: an allocated UTF-8 string
  **/
 gchar*
-gtk_text_buffer_get_text (GtkTextBuffer      *buffer,
+gtk_text_buffer_get_text (GtkTextBuffer     *buffer,
                           const GtkTextIter *start,
                           const GtkTextIter *end,
-                          gboolean             include_hidden_chars)
+                          gboolean           include_hidden_chars)
 {
   g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), NULL);
   g_return_val_if_fail (start != NULL, NULL);
@@ -1367,22 +1832,22 @@ gtk_text_buffer_get_text (GtkTextBuffer      *buffer,
  *
  * Returns the text in the range [@start,@end). Excludes undisplayed
  * text (text marked with tags that set the invisibility attribute) if
- * @include_hidden_chars is FALSE. The returned string includes a
+ * @include_hidden_chars is %FALSE. The returned string includes a
  * 0xFFFC character whenever the buffer contains
  * embedded images, so byte and character indexes into
  * the returned string <emphasis>do</emphasis> correspond to byte
  * and character indexes into the buffer. Contrast with
- * gtk_text_buffer_get_text (). Note that 0xFFFC can occur in normal
+ * gtk_text_buffer_get_text(). Note that 0xFFFC can occur in normal
  * text as well, so it is not a reliable indicator that a pixbuf or
  * widget is in the buffer.
  *
  * Return value: an allocated UTF-8 string
  **/
 gchar*
-gtk_text_buffer_get_slice (GtkTextBuffer      *buffer,
+gtk_text_buffer_get_slice (GtkTextBuffer     *buffer,
                            const GtkTextIter *start,
                            const GtkTextIter *end,
-                           gboolean             include_hidden_chars)
+                           gboolean           include_hidden_chars)
 {
   g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), NULL);
   g_return_val_if_fail (start != NULL, NULL);
@@ -1401,13 +1866,13 @@ gtk_text_buffer_get_slice (GtkTextBuffer      *buffer,
  */
 
 static void
-gtk_text_buffer_real_insert_pixbuf (GtkTextBuffer     *buffer,
-                                    GtkTextIter       *iter,
-                                    GdkPixbuf         *pixbuf)
+gtk_text_buffer_real_insert_pixbuf (GtkTextBuffer *buffer,
+                                    GtkTextIter   *iter,
+                                    GdkPixbuf     *pixbuf)
 { 
   _gtk_text_btree_insert_pixbuf (iter, pixbuf);
 
-  g_signal_emit (G_OBJECT (buffer), signals[CHANGED], 0);
+  g_signal_emit (buffer, signals[CHANGED], 0);
 }
 
 /**
@@ -1424,19 +1889,18 @@ gtk_text_buffer_real_insert_pixbuf (GtkTextBuffer     *buffer,
  * this character for pixbufs, but the "text" variants do
  * not. e.g. see gtk_text_buffer_get_slice() and
  * gtk_text_buffer_get_text().
- * 
  **/
 void
-gtk_text_buffer_insert_pixbuf         (GtkTextBuffer      *buffer,
-                                       GtkTextIter        *iter,
-                                       GdkPixbuf          *pixbuf)
+gtk_text_buffer_insert_pixbuf (GtkTextBuffer *buffer,
+                               GtkTextIter   *iter,
+                               GdkPixbuf     *pixbuf)
 {
   g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
   g_return_if_fail (iter != NULL);
   g_return_if_fail (GDK_IS_PIXBUF (pixbuf));
   g_return_if_fail (gtk_text_iter_get_buffer (iter) == buffer);
   
-  g_signal_emit (G_OBJECT (buffer), signals[INSERT_PIXBUF], 0,
+  g_signal_emit (buffer, signals[INSERT_PIXBUF], 0,
                  iter, pixbuf);
 }
 
@@ -1452,7 +1916,7 @@ gtk_text_buffer_real_insert_anchor (GtkTextBuffer      *buffer,
 {
   _gtk_text_btree_insert_child_anchor (iter, anchor);
 
-  g_signal_emit (G_OBJECT (buffer), signals[CHANGED], 0);
+  g_signal_emit (buffer, signals[CHANGED], 0);
 }
 
 /**
@@ -1466,13 +1930,12 @@ gtk_text_buffer_real_insert_anchor (GtkTextBuffer      *buffer,
  * when obtaining the buffer contents as a string, will be represented
  * by the Unicode "object replacement character" 0xFFFC. Note that the
  * "slice" variants for obtaining portions of the buffer as a string
- * include this character for pixbufs, but the "text" variants do
- * not. e.g. see gtk_text_buffer_get_slice() and
+ * include this character for child anchors, but the "text" variants do
+ * not. E.g. see gtk_text_buffer_get_slice() and
  * gtk_text_buffer_get_text(). Consider
  * gtk_text_buffer_create_child_anchor() as a more convenient
  * alternative to this function. The buffer will add a reference to
  * the anchor, so you can unref it after insertion.
- * 
  **/
 void
 gtk_text_buffer_insert_child_anchor (GtkTextBuffer      *buffer,
@@ -1484,11 +1947,10 @@ gtk_text_buffer_insert_child_anchor (GtkTextBuffer      *buffer,
   g_return_if_fail (GTK_IS_TEXT_CHILD_ANCHOR (anchor));
   g_return_if_fail (gtk_text_iter_get_buffer (iter) == buffer);
   
-  g_signal_emit (G_OBJECT (buffer), signals[INSERT_CHILD_ANCHOR], 0,
+  g_signal_emit (buffer, signals[INSERT_CHILD_ANCHOR], 0,
                  iter, anchor);
 }
 
-
 /**
  * gtk_text_buffer_create_child_anchor:
  * @buffer: a #GtkTextBuffer
@@ -1496,7 +1958,9 @@ gtk_text_buffer_insert_child_anchor (GtkTextBuffer      *buffer,
  * 
  * This is a convenience function which simply creates a child anchor
  * with gtk_text_child_anchor_new() and inserts it into the buffer
- * with gtk_text_buffer_insert_child_anchor().
+ * with gtk_text_buffer_insert_child_anchor(). The new anchor is
+ * owned by the buffer; no reference count is returned to
+ * the caller of gtk_text_buffer_create_child_anchor().
  * 
  * Return value: the created child anchor
  **/
@@ -1514,7 +1978,7 @@ gtk_text_buffer_create_child_anchor (GtkTextBuffer *buffer,
 
   gtk_text_buffer_insert_child_anchor (buffer, iter, anchor);
 
-  g_object_unref (G_OBJECT (anchor));
+  g_object_unref (anchor);
 
   return anchor;
 }
@@ -1529,47 +1993,49 @@ gtk_text_buffer_mark_set (GtkTextBuffer     *buffer,
                           GtkTextMark       *mark)
 {
   /* IMO this should NOT work like insert_text and delete_range,
-     where the real action happens in the default handler.
-
-     The reason is that the default handler would be _required_,
-     i.e. the whole widget would start breaking and segfaulting
-     if the default handler didn't get run. So you can't really
-     override the default handler or stop the emission; that is,
-     this signal is purely for notification, and not to allow users
-     to modify the default behavior. */
+   * where the real action happens in the default handler.
+   * 
+   * The reason is that the default handler would be _required_,
+   * i.e. the whole widget would start breaking and segfaulting if the
+   * default handler didn't get run. So you can't really override the
+   * default handler or stop the emission; that is, this signal is
+   * purely for notification, and not to allow users to modify the
+   * default behavior.
+   */
 
-  g_object_ref (G_OBJECT (mark));
+  g_object_ref (mark);
 
-  g_signal_emit (G_OBJECT (buffer),
+  g_signal_emit (buffer,
                  signals[MARK_SET],
                  0,
                  location,
                  mark);
 
-  g_object_unref (G_OBJECT (mark));
+  g_object_unref (mark);
 }
 
 /**
  * gtk_text_buffer_set_mark:
  * @buffer:       a #GtkTextBuffer
  * @mark_name:    name of the mark
- * @iter:         location for the mark.
- * @left_gravity: if the mark is created by this function, gravity for the new
- *                mark.
+ * @iter:         location for the mark
+ * @left_gravity: if the mark is created by this function, gravity for 
+ *                the new mark
  * @should_exist: if %TRUE, warn if the mark does not exist, and return
- *                immediately.
+ *                immediately
  *
- * Move the mark to the given position, if not @should_exist, create the mark.
+ * Move the mark to the given position, if not @should_exist, 
+ * create the mark.
  *
  * Return value: mark
  **/
 static GtkTextMark*
-gtk_text_buffer_set_mark (GtkTextBuffer *buffer,
-                          GtkTextMark *existing_mark,
-                          const gchar *mark_name,
+gtk_text_buffer_set_mark (GtkTextBuffer     *buffer,
+                          GtkTextMark       *existing_mark,
+                          const gchar       *mark_name,
                           const GtkTextIter *iter,
-                          gboolean left_gravity,
-                          gboolean should_exist)
+                          gboolean           left_gravity,
+                          gboolean           should_exist)
 {
   GtkTextIter location;
   GtkTextMark *mark;
@@ -1583,12 +2049,6 @@ gtk_text_buffer_set_mark (GtkTextBuffer *buffer,
                                    iter,
                                    should_exist);
   
-  if (_gtk_text_btree_mark_is_insert (get_btree (buffer), mark) ||
-      _gtk_text_btree_mark_is_selection_bound (get_btree (buffer), mark))
-    {
-      gtk_text_buffer_update_primary_selection (buffer);
-    }
-
   _gtk_text_btree_get_iter_at_mark (get_btree (buffer),
                                    &location,
                                    mark);
@@ -1601,13 +2061,13 @@ gtk_text_buffer_set_mark (GtkTextBuffer *buffer,
 /**
  * gtk_text_buffer_create_mark:
  * @buffer: a #GtkTextBuffer
- * @mark_name: name for mark, or %NULL
+ * @mark_name: (allow-none): name for mark, or %NULL
  * @where: location to place mark
  * @left_gravity: whether the mark has left gravity
  *
  * Creates a mark at position @where. If @mark_name is %NULL, the mark
  * is anonymous; otherwise, the mark can be retrieved by name using
- * gtk_text_buffer_get_mark (). If a mark has left gravity, and text is
+ * gtk_text_buffer_get_mark(). If a mark has left gravity, and text is
  * inserted at the mark's current location, the mark will be moved to
  * the left of the newly-inserted text. If the mark has right gravity
  * (@left_gravity = %FALSE), the mark will end up on the right of
@@ -1615,21 +2075,21 @@ gtk_text_buffer_set_mark (GtkTextBuffer *buffer,
  * with right gravity (when you type, the cursor stays on the right
  * side of the text you're typing).
  *
- * The caller of this function does <emphasis>not</emphasis> own a reference
- * to the returned #GtkTextMark, so you can ignore the return value
- * if you like. Marks are owned by the buffer and go away when the
- * buffer does.
+ * The caller of this function does <emphasis>not</emphasis> own a 
+ * reference to the returned #GtkTextMark, so you can ignore the 
+ * return value if you like. Marks are owned by the buffer and go 
+ * away when the buffer does.
  *
- * Emits the "mark_set" signal as notification of the mark's initial
+ * Emits the "mark-set" signal as notification of the mark's initial
  * placement.
  *
  * Return value: the new #GtkTextMark object
  **/
 GtkTextMark*
-gtk_text_buffer_create_mark (GtkTextBuffer *buffer,
-                             const gchar *mark_name,
+gtk_text_buffer_create_mark (GtkTextBuffer     *buffer,
+                             const gchar       *mark_name,
                              const GtkTextIter *where,
-                             gboolean left_gravity)
+                             gboolean           left_gravity)
 {
   g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), NULL);
 
@@ -1637,18 +2097,56 @@ gtk_text_buffer_create_mark (GtkTextBuffer *buffer,
                                    left_gravity, FALSE);
 }
 
+/**
+ * gtk_text_buffer_add_mark:
+ * @buffer: a #GtkTextBuffer
+ * @mark: the mark to add
+ * @where: location to place mark
+ *
+ * Adds the mark at position @where. The mark must not be added to
+ * another buffer, and if its name is not %NULL then there must not
+ * be another mark in the buffer with the same name.
+ *
+ * Emits the "mark-set" signal as notification of the mark's initial
+ * placement.
+ *
+ * Since: 2.12
+ **/
+void
+gtk_text_buffer_add_mark (GtkTextBuffer     *buffer,
+                          GtkTextMark       *mark,
+                          const GtkTextIter *where)
+{
+  const gchar *name;
+
+  g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
+  g_return_if_fail (GTK_IS_TEXT_MARK (mark));
+  g_return_if_fail (where != NULL);
+  g_return_if_fail (gtk_text_mark_get_buffer (mark) == NULL);
+
+  name = gtk_text_mark_get_name (mark);
+
+  if (name != NULL && gtk_text_buffer_get_mark (buffer, name) != NULL)
+    {
+      g_critical ("Mark %s already exists in the buffer", name);
+      return;
+    }
+
+  gtk_text_buffer_set_mark (buffer, mark, NULL, where, FALSE, FALSE);
+}
+
 /**
  * gtk_text_buffer_move_mark:
  * @buffer: a #GtkTextBuffer
  * @mark: a #GtkTextMark
  * @where: new location for @mark in @buffer
  *
- * Moves @mark to the new location @where. Emits the "mark_set" signal
+ * Moves @mark to the new location @where. Emits the "mark-set" signal
  * as notification of the move.
  **/
 void
-gtk_text_buffer_move_mark (GtkTextBuffer *buffer,
-                           GtkTextMark *mark,
+gtk_text_buffer_move_mark (GtkTextBuffer     *buffer,
+                           GtkTextMark       *mark,
                            const GtkTextIter *where)
 {
   g_return_if_fail (GTK_IS_TEXT_MARK (mark));
@@ -1668,8 +2166,8 @@ gtk_text_buffer_move_mark (GtkTextBuffer *buffer,
  **/
 void
 gtk_text_buffer_get_iter_at_mark (GtkTextBuffer *buffer,
-                                  GtkTextIter *iter,
-                                  GtkTextMark *mark)
+                                  GtkTextIter   *iter,
+                                  GtkTextMark   *mark)
 {
   g_return_if_fail (GTK_IS_TEXT_MARK (mark));
   g_return_if_fail (!gtk_text_mark_get_deleted (mark));
@@ -1687,13 +2185,13 @@ gtk_text_buffer_get_iter_at_mark (GtkTextBuffer *buffer,
  *
  * Deletes @mark, so that it's no longer located anywhere in the
  * buffer. Removes the reference the buffer holds to the mark, so if
- * you haven't called g_object_ref () on the mark, it will be freed. Even
+ * you haven't called g_object_ref() on the mark, it will be freed. Even
  * if the mark isn't freed, most operations on @mark become
- * invalid. There is no way to undelete a
- * mark. gtk_text_mark_get_deleted () will return TRUE after this
- * function has been called on a mark; gtk_text_mark_get_deleted ()
- * indicates that a mark no longer belongs to a buffer. The "mark_deleted"
- * signal will be emitted as notification after the mark is deleted.
+ * invalid, until it gets added to a buffer again with 
+ * gtk_text_buffer_add_mark(). Use gtk_text_mark_get_deleted() to  
+ * find out if a mark has been removed from its buffer.
+ * The "mark-deleted" signal will be emitted as notification after 
+ * the mark is deleted.
  **/
 void
 gtk_text_buffer_delete_mark (GtkTextBuffer *buffer,
@@ -1703,7 +2201,7 @@ gtk_text_buffer_delete_mark (GtkTextBuffer *buffer,
   g_return_if_fail (!gtk_text_mark_get_deleted (mark));
   g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
 
-  g_object_ref (G_OBJECT (mark));
+  g_object_ref (mark);
 
   _gtk_text_btree_remove_mark (get_btree (buffer), mark);
 
@@ -1711,11 +2209,11 @@ gtk_text_buffer_delete_mark (GtkTextBuffer *buffer,
    * removing the mark, rather than removing the mark in a default
    * handler.
    */
-  g_signal_emit (G_OBJECT (buffer), signals[MARK_DELETED],
+  g_signal_emit (buffer, signals[MARK_DELETED],
                  0,
                  mark);
 
-  g_object_unref (G_OBJECT (mark));
+  g_object_unref (mark);
 }
 
 /**
@@ -1723,14 +2221,14 @@ gtk_text_buffer_delete_mark (GtkTextBuffer *buffer,
  * @buffer: a #GtkTextBuffer
  * @name: a mark name
  *
- * Returns the mark named @name in buffer @buffer, or NULL if no such
+ * Returns the mark named @name in buffer @buffer, or %NULL if no such
  * mark exists in the buffer.
  *
- * Return value: a #GtkTextMark, or NULL
+ * Return value: (transfer none): a #GtkTextMark, or %NULL
  **/
 GtkTextMark*
-gtk_text_buffer_get_mark (GtkTextBuffer      *buffer,
-                          const gchar         *name)
+gtk_text_buffer_get_mark (GtkTextBuffer *buffer,
+                          const gchar   *name)
 {
   GtkTextMark *mark;
 
@@ -1742,7 +2240,6 @@ gtk_text_buffer_get_mark (GtkTextBuffer      *buffer,
   return mark;
 }
 
-
 /**
  * gtk_text_buffer_move_mark_by_name:
  * @buffer: a #GtkTextBuffer
@@ -1750,7 +2247,7 @@ gtk_text_buffer_get_mark (GtkTextBuffer      *buffer,
  * @where: new location for mark
  *
  * Moves the mark named @name (which must exist) to location @where.
- * See gtk_text_buffer_move_mark () for details.
+ * See gtk_text_buffer_move_mark() for details.
  **/
 void
 gtk_text_buffer_move_mark_by_name (GtkTextBuffer     *buffer,
@@ -1779,11 +2276,11 @@ gtk_text_buffer_move_mark_by_name (GtkTextBuffer     *buffer,
  * @name: name of a mark in @buffer
  *
  * Deletes the mark named @name; the mark must exist. See
- * gtk_text_buffer_delete_mark () for details.
+ * gtk_text_buffer_delete_mark() for details.
  **/
 void
-gtk_text_buffer_delete_mark_by_name (GtkTextBuffer     *buffer,
-                                     const gchar       *name)
+gtk_text_buffer_delete_mark_by_name (GtkTextBuffer *buffer,
+                                     const gchar   *name)
 {
   GtkTextMark *mark;
 
@@ -1806,19 +2303,18 @@ gtk_text_buffer_delete_mark_by_name (GtkTextBuffer     *buffer,
  * @buffer: a #GtkTextBuffer
  *
  * Returns the mark that represents the cursor (insertion point).
- * Equivalent to calling gtk_text_buffer_get_mark () to get the mark
- * name "insert," but very slightly more efficient, and involves less
+ * Equivalent to calling gtk_text_buffer_get_mark() to get the mark
+ * named "insert", but very slightly more efficient, and involves less
  * typing.
  *
- * Return value: insertion point mark
+ * Return value: (transfer none): insertion point mark
  **/
 GtkTextMark*
 gtk_text_buffer_get_insert (GtkTextBuffer *buffer)
 {
   g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), NULL);
 
-  /* FIXME use struct member in btree */
-  return gtk_text_buffer_get_mark (buffer, "insert");
+  return _gtk_text_btree_get_insert (get_btree (buffer));
 }
 
 /**
@@ -1826,28 +2322,35 @@ gtk_text_buffer_get_insert (GtkTextBuffer *buffer)
  * @buffer: a #GtkTextBuffer
  *
  * Returns the mark that represents the selection bound.  Equivalent
- * to calling gtk_text_buffer_get_mark () to get the mark name
- * "selection_bound," but very slightly more efficient, and involves
+ * to calling gtk_text_buffer_get_mark() to get the mark named
+ * "selection_bound", but very slightly more efficient, and involves
  * less typing.
  *
  * The currently-selected text in @buffer is the region between the
  * "selection_bound" and "insert" marks. If "selection_bound" and
  * "insert" are in the same place, then there is no current selection.
- * gtk_text_buffer_get_selection_bounds () is another convenient function
+ * gtk_text_buffer_get_selection_bounds() is another convenient function
  * for handling the selection, if you just want to know whether there's a
  * selection and what its bounds are.
  *
- * Return value: selection bound mark
+ * Return value: (transfer none): selection bound mark
  **/
 GtkTextMark*
 gtk_text_buffer_get_selection_bound (GtkTextBuffer *buffer)
 {
   g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), NULL);
 
-  /* FIXME use struct member in btree */
-  return gtk_text_buffer_get_mark (buffer, "selection_bound");
+  return _gtk_text_btree_get_selection_bound (get_btree (buffer));
 }
 
+/**
+ * gtk_text_buffer_get_iter_at_child_anchor:
+ * @buffer: a #GtkTextBuffer
+ * @iter: an iterator to be initialized
+ * @anchor: a child anchor that appears in @buffer
+ *
+ * Obtains the location of @anchor within @buffer.
+ **/
 void
 gtk_text_buffer_get_iter_at_child_anchor (GtkTextBuffer      *buffer,
                                           GtkTextIter        *iter,
@@ -1870,7 +2373,7 @@ gtk_text_buffer_get_iter_at_child_anchor (GtkTextBuffer      *buffer,
  *
  * This function moves the "insert" and "selection_bound" marks
  * simultaneously.  If you move them to the same place in two steps
- * with gtk_text_buffer_move_mark (), you will temporarily select a
+ * with gtk_text_buffer_move_mark(), you will temporarily select a
  * region in between their old and new locations, which can be pretty
  * inefficient since the temporarily-selected region will force stuff
  * to be recalculated. This function moves them as a unit, which can
@@ -1880,22 +2383,43 @@ void
 gtk_text_buffer_place_cursor (GtkTextBuffer     *buffer,
                               const GtkTextIter *where)
 {
-  GtkTextIter real;
+  gtk_text_buffer_select_range (buffer, where, where);
+}
 
-  g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
+/**
+ * gtk_text_buffer_select_range:
+ * @buffer: a #GtkTextBuffer
+ * @ins: where to put the "insert" mark
+ * @bound: where to put the "selection_bound" mark
+ *
+ * This function moves the "insert" and "selection_bound" marks
+ * simultaneously.  If you move them in two steps
+ * with gtk_text_buffer_move_mark(), you will temporarily select a
+ * region in between their old and new locations, which can be pretty
+ * inefficient since the temporarily-selected region will force stuff
+ * to be recalculated. This function moves them as a unit, which can
+ * be optimized.
+ *
+ * Since: 2.4
+ **/
+void
+gtk_text_buffer_select_range (GtkTextBuffer     *buffer,
+                             const GtkTextIter *ins,
+                              const GtkTextIter *bound)
+{
+  GtkTextIter real_ins;
+  GtkTextIter real_bound;
 
-  real = *where;
+  g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
 
-  if (gtk_text_iter_is_end (&real))
-    gtk_text_iter_backward_char (&real);
+  real_ins = *ins;
+  real_bound = *bound;
 
-  _gtk_text_btree_place_cursor (get_btree (buffer), &real);
-  gtk_text_buffer_mark_set (buffer, &real,
-                            gtk_text_buffer_get_mark (buffer,
-                                                      "insert"));
-  gtk_text_buffer_mark_set (buffer, &real,
-                            gtk_text_buffer_get_mark (buffer,
-                                                      "selection_bound"));
+  _gtk_text_btree_select_range (get_btree (buffer), &real_ins, &real_bound);
+  gtk_text_buffer_mark_set (buffer, &real_ins,
+                            gtk_text_buffer_get_insert (buffer));
+  gtk_text_buffer_mark_set (buffer, &real_bound,
+                            gtk_text_buffer_get_selection_bound (buffer));
 }
 
 /*
@@ -1905,15 +2429,15 @@ gtk_text_buffer_place_cursor (GtkTextBuffer     *buffer,
 /**
  * gtk_text_buffer_create_tag:
  * @buffer: a #GtkTextBuffer
- * @tag_name: name of the new tag, or %NULL
- * @first_property_name: name of first property to set, or %NULL
+ * @tag_name: (allow-none): name of the new tag, or %NULL
+ * @first_property_name: (allow-none): name of first property to set, or %NULL
  * @Varargs: %NULL-terminated list of property names and values
  *
  *
  * Creates a tag and adds it to the tag table for @buffer.
- * Equivalent to calling gtk_text_tag_new () and then adding the
- * tag to the buffer's tag table. The returned tag has its refcount
- * incremented, as if you'd called gtk_text_tag_new ().
+ * Equivalent to calling gtk_text_tag_new() and then adding the
+ * tag to the buffer's tag table. The returned tag is owned by
+ * the buffer's tag table, so the ref count will be equal to one.
  *
  * If @tag_name is %NULL, the tag is anonymous.
  *
@@ -1947,12 +2471,14 @@ gtk_text_buffer_create_tag (GtkTextBuffer *buffer,
       va_end (list);
     }
   
+  g_object_unref (tag);
+
   return tag;
 }
 
 static void
-gtk_text_buffer_real_apply_tag (GtkTextBuffer *buffer,
-                                GtkTextTag *tag,
+gtk_text_buffer_real_apply_tag (GtkTextBuffer     *buffer,
+                                GtkTextTag        *tag,
                                 const GtkTextIter *start,
                                 const GtkTextIter *end)
 {
@@ -1966,8 +2492,8 @@ gtk_text_buffer_real_apply_tag (GtkTextBuffer *buffer,
 }
 
 static void
-gtk_text_buffer_real_remove_tag (GtkTextBuffer *buffer,
-                                 GtkTextTag *tag,
+gtk_text_buffer_real_remove_tag (GtkTextBuffer     *buffer,
+                                 GtkTextTag        *tag,
                                  const GtkTextIter *start,
                                  const GtkTextIter *end)
 {
@@ -1987,9 +2513,39 @@ gtk_text_buffer_real_changed (GtkTextBuffer *buffer)
 }
 
 static void
-gtk_text_buffer_emit_tag (GtkTextBuffer *buffer,
-                          GtkTextTag *tag,
-                          gboolean apply,
+gtk_text_buffer_real_mark_set (GtkTextBuffer     *buffer,
+                               const GtkTextIter *iter,
+                               GtkTextMark       *mark)
+{
+  GtkTextMark *insert;
+  
+  insert = gtk_text_buffer_get_insert (buffer);
+
+  if (mark == insert || mark == gtk_text_buffer_get_selection_bound (buffer))
+    {
+      gboolean has_selection;
+
+      update_selection_clipboards (buffer);
+    
+      has_selection = gtk_text_buffer_get_selection_bounds (buffer,
+                                                            NULL,
+                                                            NULL);
+
+      if (has_selection != buffer->has_selection)
+        {
+          buffer->has_selection = has_selection;
+          g_object_notify (G_OBJECT (buffer), "has-selection");
+        }
+    }
+    
+    if (mark == insert)
+      g_object_notify (G_OBJECT (buffer), "cursor-position");
+}
+
+static void
+gtk_text_buffer_emit_tag (GtkTextBuffer     *buffer,
+                          GtkTextTag        *tag,
+                          gboolean           apply,
                           const GtkTextIter *start,
                           const GtkTextIter *end)
 {
@@ -2001,16 +2557,15 @@ gtk_text_buffer_emit_tag (GtkTextBuffer *buffer,
   gtk_text_iter_order (&start_tmp, &end_tmp);
 
   if (apply)
-    g_signal_emit (G_OBJECT (buffer), signals[APPLY_TAG],
+    g_signal_emit (buffer, signals[APPLY_TAG],
                    0,
                    tag, &start_tmp, &end_tmp);
   else
-    g_signal_emit (G_OBJECT (buffer), signals[REMOVE_TAG],
+    g_signal_emit (buffer, signals[REMOVE_TAG],
                    0,
                    tag, &start_tmp, &end_tmp);
 }
 
-
 /**
  * gtk_text_buffer_apply_tag:
  * @buffer: a #GtkTextBuffer
@@ -2018,14 +2573,13 @@ gtk_text_buffer_emit_tag (GtkTextBuffer *buffer,
  * @start: one bound of range to be tagged
  * @end: other bound of range to be tagged
  *
- * Emits the "apply_tag" signal on @buffer. The default
+ * Emits the "apply-tag" signal on @buffer. The default
  * handler for the signal applies @tag to the given range.
  * @start and @end do not have to be in order.
- * 
  **/
 void
-gtk_text_buffer_apply_tag (GtkTextBuffer *buffer,
-                           GtkTextTag    *tag,
+gtk_text_buffer_apply_tag (GtkTextBuffer     *buffer,
+                           GtkTextTag        *tag,
                            const GtkTextIter *start,
                            const GtkTextIter *end)
 {
@@ -2047,14 +2601,13 @@ gtk_text_buffer_apply_tag (GtkTextBuffer *buffer,
  * @start: one bound of range to be untagged
  * @end: other bound of range to be untagged
  *
- * Emits the "remove_tag" signal. The default handler for the signal
+ * Emits the "remove-tag" signal. The default handler for the signal
  * removes all occurrences of @tag from the given range. @start and
  * @end don't have to be in order.
- * 
  **/
 void
-gtk_text_buffer_remove_tag (GtkTextBuffer *buffer,
-                            GtkTextTag    *tag,
+gtk_text_buffer_remove_tag (GtkTextBuffer     *buffer,
+                            GtkTextTag        *tag,
                             const GtkTextIter *start,
                             const GtkTextIter *end)
 
@@ -2070,7 +2623,6 @@ gtk_text_buffer_remove_tag (GtkTextBuffer *buffer,
   gtk_text_buffer_emit_tag (buffer, tag, FALSE, start, end);
 }
 
-
 /**
  * gtk_text_buffer_apply_tag_by_name:
  * @buffer: a #GtkTextBuffer
@@ -2080,11 +2632,10 @@ gtk_text_buffer_remove_tag (GtkTextBuffer *buffer,
  *
  * Calls gtk_text_tag_table_lookup() on the buffer's tag table to
  * get a #GtkTextTag, then calls gtk_text_buffer_apply_tag().
- * 
  **/
 void
-gtk_text_buffer_apply_tag_by_name (GtkTextBuffer *buffer,
-                                   const gchar   *name,
+gtk_text_buffer_apply_tag_by_name (GtkTextBuffer     *buffer,
+                                   const gchar       *name,
                                    const GtkTextIter *start,
                                    const GtkTextIter *end)
 {
@@ -2118,12 +2669,10 @@ gtk_text_buffer_apply_tag_by_name (GtkTextBuffer *buffer,
  *
  * Calls gtk_text_tag_table_lookup() on the buffer's tag table to
  * get a #GtkTextTag, then calls gtk_text_buffer_remove_tag().
- * 
- * 
  **/
 void
-gtk_text_buffer_remove_tag_by_name (GtkTextBuffer *buffer,
-                                    const gchar *name,
+gtk_text_buffer_remove_tag_by_name (GtkTextBuffer     *buffer,
+                                    const gchar       *name,
                                     const GtkTextIter *start,
                                     const GtkTextIter *end)
 {
@@ -2180,7 +2729,7 @@ gtk_text_buffer_remove_all_tags (GtkTextBuffer     *buffer,
   GtkTextIter first, second, tmp;
   GSList *tags;
   GSList *tmp_list;
-  GSList *prev;
+  GSList *prev, *next;
   GtkTextTag *tag;
   
   g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
@@ -2235,14 +2784,15 @@ gtk_text_buffer_remove_all_tags (GtkTextBuffer     *buffer,
       if (tag == tmp_list->data)
         {
           /* duplicate */
+          next = tmp_list->next;
           if (prev)
-            prev->next = tmp_list->next;
+            prev->next = next;
 
           tmp_list->next = NULL;
 
           g_slist_free (tmp_list);
 
-          tmp_list = prev->next;
+          tmp_list = next;
           /* prev is unchanged */
         }
       else
@@ -2287,13 +2837,12 @@ gtk_text_buffer_remove_all_tags (GtkTextBuffer     *buffer,
  * line. The @char_offset must exist, offsets off the end of the line
  * are not allowed. Note <emphasis>characters</emphasis>, not bytes;
  * UTF-8 may encode one character as multiple bytes.
- * 
  **/
 void
-gtk_text_buffer_get_iter_at_line_offset (GtkTextBuffer      *buffer,
-                                         GtkTextIter        *iter,
-                                         gint                line_number,
-                                         gint                char_offset)
+gtk_text_buffer_get_iter_at_line_offset (GtkTextBuffer *buffer,
+                                         GtkTextIter   *iter,
+                                         gint           line_number,
+                                         gint           char_offset)
 {
   g_return_if_fail (iter != NULL);
   g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
@@ -2313,7 +2862,6 @@ gtk_text_buffer_get_iter_at_line_offset (GtkTextBuffer      *buffer,
  * @byte_index must be the start of a UTF-8 character, and must not be
  * beyond the end of the line.  Note <emphasis>bytes</emphasis>, not
  * characters; UTF-8 may encode one character as multiple bytes.
- * 
  **/
 void
 gtk_text_buffer_get_iter_at_line_index  (GtkTextBuffer *buffer,
@@ -2337,9 +2885,9 @@ gtk_text_buffer_get_iter_at_line_index  (GtkTextBuffer *buffer,
  * Initializes @iter to the start of the given line.
  **/
 void
-gtk_text_buffer_get_iter_at_line    (GtkTextBuffer      *buffer,
-                                     GtkTextIter        *iter,
-                                     gint                line_number)
+gtk_text_buffer_get_iter_at_line (GtkTextBuffer *buffer,
+                                  GtkTextIter   *iter,
+                                  gint           line_number)
 {
   g_return_if_fail (iter != NULL);
   g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
@@ -2351,16 +2899,17 @@ gtk_text_buffer_get_iter_at_line    (GtkTextBuffer      *buffer,
  * gtk_text_buffer_get_iter_at_offset:
  * @buffer: a #GtkTextBuffer 
  * @iter: iterator to initialize
- * @char_offset: char offset from start of buffer, counting from 0
+ * @char_offset: char offset from start of buffer, counting from 0, or -1
  *
  * Initializes @iter to a position @char_offset chars from the start
- * of the entire buffer.
- * 
+ * of the entire buffer. If @char_offset is -1 or greater than the number
+ * of characters in the buffer, @iter is initialized to the end iterator,
+ * the iterator one past the last valid character in the buffer.
  **/
 void
-gtk_text_buffer_get_iter_at_offset         (GtkTextBuffer      *buffer,
-                                            GtkTextIter        *iter,
-                                            gint                char_offset)
+gtk_text_buffer_get_iter_at_offset (GtkTextBuffer *buffer,
+                                    GtkTextIter   *iter,
+                                    gint           char_offset)
 {
   g_return_if_fail (iter != NULL);
   g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
@@ -2376,7 +2925,6 @@ gtk_text_buffer_get_iter_at_offset         (GtkTextBuffer      *buffer,
  * Initialized @iter with the first position in the text buffer. This
  * is the same as using gtk_text_buffer_get_iter_at_offset() to get
  * the iter at character offset 0.
- * 
  **/
 void
 gtk_text_buffer_get_start_iter (GtkTextBuffer *buffer,
@@ -2399,11 +2947,10 @@ gtk_text_buffer_get_start_iter (GtkTextBuffer *buffer,
  * 0. The entire buffer lies in the range from the first position in
  * the buffer (call gtk_text_buffer_get_start_iter() to get
  * character position 0) to the end iterator.
- * 
  **/
 void
-gtk_text_buffer_get_end_iter         (GtkTextBuffer      *buffer,
-                                       GtkTextIter        *iter)
+gtk_text_buffer_get_end_iter (GtkTextBuffer *buffer,
+                              GtkTextIter   *iter)
 {
   g_return_if_fail (iter != NULL);
   g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
@@ -2419,7 +2966,6 @@ gtk_text_buffer_get_end_iter         (GtkTextBuffer      *buffer,
  *
  * Retrieves the first and last iterators in the buffer, i.e. the
  * entire buffer lies within the range [@start,@end).
- * 
  **/
 void
 gtk_text_buffer_get_bounds (GtkTextBuffer *buffer,
@@ -2466,12 +3012,11 @@ gtk_text_buffer_get_modified (GtkTextBuffer *buffer)
  * last time it was saved. Whenever the buffer is saved to disk, call
  * gtk_text_buffer_set_modified (@buffer, FALSE). When the buffer is modified,
  * it will automatically toggled on the modified bit again. When the modified
- * bit flips, the buffer emits a "modified_changed" signal.
- * 
+ * bit flips, the buffer emits a "modified-changed" signal.
  **/
 void
-gtk_text_buffer_set_modified (GtkTextBuffer      *buffer,
-                              gboolean             setting)
+gtk_text_buffer_set_modified (GtkTextBuffer *buffer,
+                              gboolean       setting)
 {
   gboolean fixed_setting;
 
@@ -2484,10 +3029,28 @@ gtk_text_buffer_set_modified (GtkTextBuffer      *buffer,
   else
     {
       buffer->modified = fixed_setting;
-      g_signal_emit (G_OBJECT (buffer), signals[MODIFIED_CHANGED], 0);
+      g_signal_emit (buffer, signals[MODIFIED_CHANGED], 0);
     }
 }
 
+/**
+ * gtk_text_buffer_get_has_selection:
+ * @buffer: a #GtkTextBuffer 
+ * 
+ * Indicates whether the buffer has some text currently selected.
+ * 
+ * Return value: %TRUE if the there is text selected
+ *
+ * Since: 2.10
+ **/
+gboolean
+gtk_text_buffer_get_has_selection (GtkTextBuffer *buffer)
+{
+  g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), FALSE);
+
+  return buffer->has_selection;
+}
+
 
 /*
  * Assorted other stuff
@@ -2541,13 +3104,13 @@ clipboard_clear_selection_cb (GtkClipboard *clipboard,
   GtkTextBuffer *buffer = GTK_TEXT_BUFFER (data);
 
   gtk_text_buffer_get_iter_at_mark (buffer, &insert,
-                                    gtk_text_buffer_get_mark (buffer, "insert"));
+                                    gtk_text_buffer_get_insert (buffer));
   gtk_text_buffer_get_iter_at_mark (buffer, &selection_bound,
-                                    gtk_text_buffer_get_mark (buffer, "selection_bound"));
+                                    gtk_text_buffer_get_selection_bound (buffer));
 
   if (!gtk_text_iter_equal (&insert, &selection_bound))
     gtk_text_buffer_move_mark (buffer,
-                               gtk_text_buffer_get_mark (buffer, "selection_bound"),
+                               gtk_text_buffer_get_selection_bound (buffer),
                                &insert);
 }
 
@@ -2565,29 +3128,65 @@ clipboard_get_selection_cb (GtkClipboard     *clipboard,
 
   if (gtk_text_buffer_get_selection_bounds (buffer, &start, &end))
     {
-      if (selection_data->target ==
-          gdk_atom_intern ("GTK_TEXT_BUFFER_CONTENTS", FALSE))
+      if (info == GTK_TEXT_BUFFER_TARGET_INFO_BUFFER_CONTENTS)
         {
           /* Provide the address of the buffer; this will only be
            * used within-process
            */
           gtk_selection_data_set (selection_data,
-                                  gdk_atom_intern ("GTK_TEXT_BUFFER_CONTENTS", FALSE),
+                                  selection_data->target,
                                   8, /* bytes */
                                   (void*)&buffer,
                                   sizeof (buffer));
         }
+      else if (info == GTK_TEXT_BUFFER_TARGET_INFO_RICH_TEXT)
+        {
+          guint8 *str;
+          gsize   len;
+
+          str = gtk_text_buffer_serialize (buffer, buffer,
+                                           selection_data->target,
+                                           &start, &end, &len);
+
+          gtk_selection_data_set (selection_data,
+                                  selection_data->target,
+                                  8, /* bytes */
+                                  str, len);
+          g_free (str);
+        }
       else
         {
           gchar *str;
-          
+
           str = gtk_text_iter_get_visible_text (&start, &end);
-          gtk_selection_data_set_text (selection_data, str);
+          gtk_selection_data_set_text (selection_data, str, -1);
           g_free (str);
         }
     }
 }
 
+static GtkTextBuffer *
+create_clipboard_contents_buffer (GtkTextBuffer *buffer)
+{
+  GtkTextBuffer *contents;
+
+  contents = gtk_text_buffer_new (gtk_text_buffer_get_tag_table (buffer));
+
+  g_object_set_data (G_OBJECT (contents), I_("gtk-text-buffer-clipboard-source"),
+                     buffer);
+  g_object_set_data (G_OBJECT (contents), I_("gtk-text-buffer-clipboard"),
+                     GINT_TO_POINTER (1));
+
+  /*  Ref the source buffer as long as the clipboard contents buffer
+   *  exists, because it's needed for serializing the contents buffer.
+   *  See http://bugzilla.gnome.org/show_bug.cgi?id=339195
+   */
+  g_object_ref (buffer);
+  g_object_weak_ref (G_OBJECT (contents), (GWeakNotify) g_object_unref, buffer);
+
+  return contents;
+}
+
 /* Provide cut/copied data */
 static void
 clipboard_get_contents_cb (GtkClipboard     *clipboard,
@@ -2595,42 +3194,53 @@ clipboard_get_contents_cb (GtkClipboard     *clipboard,
                            guint             info,
                            gpointer          data)
 {
-  GtkTextBuffer *buffer = GTK_TEXT_BUFFER (data);
-  GtkTextBuffer *contents = buffer->clipboard_contents;
+  GtkTextBuffer *contents = GTK_TEXT_BUFFER (data);
 
-  if (selection_data->target ==
-      gdk_atom_intern ("GTK_TEXT_BUFFER_CONTENTS", FALSE))
+  g_assert (contents); /* This should never be called unless we own the clipboard */
+
+  if (info == GTK_TEXT_BUFFER_TARGET_INFO_BUFFER_CONTENTS)
     {
       /* Provide the address of the clipboard buffer; this will only
        * be used within-process. OK to supply a NULL value for contents.
        */
       gtk_selection_data_set (selection_data,
-                              gdk_atom_intern ("GTK_TEXT_BUFFER_CONTENTS", FALSE),
+                              selection_data->target,
                               8, /* bytes */
                               (void*)&contents,
                               sizeof (contents));
     }
+  else if (info == GTK_TEXT_BUFFER_TARGET_INFO_RICH_TEXT)
+    {
+      GtkTextBuffer *clipboard_source_buffer;
+      GtkTextIter start, end;
+      guint8 *str;
+      gsize   len;
+
+      clipboard_source_buffer = g_object_get_data (G_OBJECT (contents),
+                                                   "gtk-text-buffer-clipboard-source");
+
+      gtk_text_buffer_get_bounds (contents, &start, &end);
+
+      str = gtk_text_buffer_serialize (clipboard_source_buffer, contents,
+                                       selection_data->target,
+                                       &start, &end, &len);
+
+      gtk_selection_data_set (selection_data,
+                             selection_data->target,
+                             8, /* bytes */
+                             str, len);
+      g_free (str);
+    }
   else
     {
-      /* Just provide text from the clipboard buffer */
-      if (buffer->clipboard_contents)
-        {
-          gchar *str;
-          GtkTextIter start, end;
-          
-          gtk_text_buffer_get_bounds (contents, &start, &end);
-          /* strip off the trailing newline, it isn't part of the text that was cut */
-          gtk_text_iter_backward_char (&end);
-          
-          str = gtk_text_iter_get_visible_text (&start, &end);
-          gtk_selection_data_set_text (selection_data, str);
-          g_free (str);
-        }
-      else
-        {
-          gtk_selection_data_set_text (selection_data, "");
-          return;
-        }
+      gchar *str;
+      GtkTextIter start, end;
+
+      gtk_text_buffer_get_bounds (contents, &start, &end);
+
+      str = gtk_text_iter_get_visible_text (&start, &end);
+      gtk_selection_data_set_text (selection_data, str, -1);
+      g_free (str);
     }
 }
 
@@ -2638,13 +3248,9 @@ static void
 clipboard_clear_contents_cb (GtkClipboard *clipboard,
                              gpointer      data)
 {
-  GtkTextBuffer *buffer = GTK_TEXT_BUFFER (data);
+  GtkTextBuffer *contents = GTK_TEXT_BUFFER (data);
 
-  if (buffer->clipboard_contents)
-    {
-      g_object_unref (G_OBJECT (buffer->clipboard_contents));
-      buffer->clipboard_contents = NULL;
-    }  
+  g_object_unref (contents);
 }
 
 static void
@@ -2670,8 +3276,7 @@ get_paste_point (GtkTextBuffer *buffer,
   else
     {
       gtk_text_buffer_get_iter_at_mark (buffer, &insert_point,
-                                        gtk_text_buffer_get_mark (buffer,
-                                                                  "insert"));
+                                        gtk_text_buffer_get_insert (buffer));
     }
 
   *iter = insert_point;
@@ -2718,6 +3323,20 @@ post_paste_cleanup (ClipboardRequest *request_data)
     }
 }
 
+static void
+emit_paste_done (GtkTextBuffer *buffer,
+                 GtkClipboard  *clipboard)
+{
+  g_signal_emit (buffer, signals[PASTE_DONE], 0, clipboard);
+}
+
+static void
+free_clipboard_request (ClipboardRequest *request_data)
+{
+  g_object_unref (request_data->buffer);
+  g_free (request_data);
+}
+
 /* Called when we request a paste and receive the text data
  */
 static void
@@ -2731,21 +3350,28 @@ clipboard_text_received (GtkClipboard *clipboard,
   if (str)
     {
       GtkTextIter insert_point;
+      
+      if (request_data->interactive) 
+       gtk_text_buffer_begin_user_action (buffer);
 
       pre_paste_prep (request_data, &insert_point);
       
-      if (request_data->interactive)
-        gtk_text_buffer_insert_interactive (buffer, &insert_point,
-                                            str, -1, request_data->default_editable);
+      if (request_data->interactive) 
+       gtk_text_buffer_insert_interactive (buffer, &insert_point,
+                                           str, -1, request_data->default_editable);
       else
         gtk_text_buffer_insert (buffer, &insert_point,
                                 str, -1);
 
       post_paste_cleanup (request_data);
+      
+      if (request_data->interactive) 
+       gtk_text_buffer_end_user_action (buffer);
+
+      emit_paste_done (buffer, clipboard);
     }
 
-  g_object_unref (G_OBJECT (buffer));
-  g_free (request_data);
+  free_clipboard_request (request_data);
 }
 
 static GtkTextBuffer*
@@ -2756,12 +3382,17 @@ selection_data_get_buffer (GtkSelectionData *selection_data,
   GtkTextBuffer *src_buffer = NULL;
 
   /* If we can get the owner, the selection is in-process */
-  owner = gdk_selection_owner_get (selection_data->selection);
+  owner = gdk_selection_owner_get_for_display (selection_data->display,
+                                              selection_data->selection);
 
   if (owner == NULL)
     return NULL;
   
-  if (selection_data->type != gdk_atom_intern ("GTK_TEXT_BUFFER_CONTENTS", FALSE))
+  if (gdk_window_get_window_type (owner) == GDK_WINDOW_FOREIGN)
+    return NULL;
+  if (selection_data->type !=
+      gdk_atom_intern_static_string ("GTK_TEXT_BUFFER_CONTENTS"))
     return NULL;
 
   if (selection_data->length != sizeof (src_buffer))
@@ -2809,30 +3440,100 @@ restore_iter (const GtkTextIter *iter,
 #endif
 
 static void
-paste_from_buffer (ClipboardRequest    *request_data,
-                   GtkTextBuffer       *src_buffer,
-                   const GtkTextIter   *start,
-                   const GtkTextIter   *end)
+clipboard_rich_text_received (GtkClipboard *clipboard,
+                              GdkAtom       format,
+                              const guint8 *text,
+                              gsize         length,
+                              gpointer      data)
+{
+  ClipboardRequest *request_data = data;
+  GtkTextIter insert_point;
+  gboolean retval = TRUE;
+  GError *error = NULL;
+
+  if (text != NULL && length > 0)
+    {
+      pre_paste_prep (request_data, &insert_point);
+
+      if (request_data->interactive)
+        gtk_text_buffer_begin_user_action (request_data->buffer);
+
+      if (!request_data->interactive ||
+          gtk_text_iter_can_insert (&insert_point,
+                                    request_data->default_editable))
+        {
+          retval = gtk_text_buffer_deserialize (request_data->buffer,
+                                                request_data->buffer,
+                                                format,
+                                                &insert_point,
+                                                text, length,
+                                                &error);
+        }
+
+      if (!retval)
+        {
+          g_warning ("error pasting: %s\n", error->message);
+          g_clear_error (&error);
+        }
+
+      if (request_data->interactive)
+        gtk_text_buffer_end_user_action (request_data->buffer);
+
+      emit_paste_done (request_data->buffer, clipboard);
+
+      if (retval)
+        {
+          post_paste_cleanup (request_data);
+          return;
+        }
+    }
+
+  /* Request the text selection instead */
+  gtk_clipboard_request_text (clipboard,
+                              clipboard_text_received,
+                              data);
+}
+
+static void
+paste_from_buffer (GtkClipboard      *clipboard,
+                   ClipboardRequest  *request_data,
+                   GtkTextBuffer     *src_buffer,
+                   const GtkTextIter *start,
+                   const GtkTextIter *end)
 {
   GtkTextIter insert_point;
+  GtkTextBuffer *buffer = request_data->buffer;
   
   /* We're about to emit a bunch of signals, so be safe */
-  g_object_ref (G_OBJECT (src_buffer));
+  g_object_ref (src_buffer);
   
   pre_paste_prep (request_data, &insert_point);
   
+  if (request_data->interactive) 
+    gtk_text_buffer_begin_user_action (buffer);
+
   if (!gtk_text_iter_equal (start, end))
     {
-      gtk_text_buffer_real_insert_range (request_data->buffer,
-                                         &insert_point,
-                                         start,
-                                         end,
-                                         request_data->interactive);
+      if (!request_data->interactive ||
+          (gtk_text_iter_can_insert (&insert_point,
+                                     request_data->default_editable)))
+        gtk_text_buffer_real_insert_range (buffer,
+                                           &insert_point,
+                                           start,
+                                           end,
+                                           request_data->interactive);
     }
 
   post_paste_cleanup (request_data);
       
-  g_object_unref (G_OBJECT (src_buffer));
+  if (request_data->interactive) 
+    gtk_text_buffer_end_user_action (buffer);
+
+  emit_paste_done (buffer, clipboard);
+
+  g_object_unref (src_buffer);
+
+  free_clipboard_request (request_data);
 }
 
 static void
@@ -2842,107 +3543,221 @@ clipboard_clipboard_buffer_received (GtkClipboard     *clipboard,
 {
   ClipboardRequest *request_data = data;
   GtkTextBuffer *src_buffer;
-  
+
   src_buffer = selection_data_get_buffer (selection_data, request_data); 
 
   if (src_buffer)
     {
       GtkTextIter start, end;
 
-      gtk_text_buffer_get_bounds (src_buffer, &start, &end);
-      /* There's an extra newline on clipboard_contents */
-      gtk_text_iter_backward_char (&end);
-      
-      paste_from_buffer (request_data, src_buffer,
-                         &start, &end);
+      if (g_object_get_data (G_OBJECT (src_buffer), "gtk-text-buffer-clipboard"))
+       {
+         gtk_text_buffer_get_bounds (src_buffer, &start, &end);
+
+         paste_from_buffer (clipboard, request_data, src_buffer,
+                            &start, &end);
+       }
+      else
+       {
+         if (gtk_text_buffer_get_selection_bounds (src_buffer, &start, &end))
+           paste_from_buffer (clipboard, request_data, src_buffer,
+                              &start, &end);
+       }
     }
   else
     {
-      /* Request the text selection instead */
-      gtk_clipboard_request_text (clipboard,
-                                  clipboard_text_received,
-                                  data);
+      if (gtk_clipboard_wait_is_rich_text_available (clipboard,
+                                                     request_data->buffer))
+        {
+          /* Request rich text */
+          gtk_clipboard_request_rich_text (clipboard,
+                                           request_data->buffer,
+                                           clipboard_rich_text_received,
+                                           data);
+        }
+      else
+        {
+          /* Request the text selection instead */
+          gtk_clipboard_request_text (clipboard,
+                                      clipboard_text_received,
+                                      data);
+        }
     }
 }
 
+typedef struct
+{
+  GtkClipboard *clipboard;
+  guint ref_count;
+} SelectionClipboard;
+
 static void
-clipboard_selection_buffer_received (GtkClipboard     *clipboard,
-                                     GtkSelectionData *selection_data,
-                                     gpointer          data)
+update_selection_clipboards (GtkTextBuffer *buffer)
 {
-  ClipboardRequest *request_data = data;
-  GtkTextBuffer *src_buffer;
-  
-  src_buffer = selection_data_get_buffer (selection_data, request_data); 
+  GtkTextBufferPrivate *priv;
+  GSList               *tmp_list = buffer->selection_clipboards;
 
-  if (src_buffer)
+  priv = GTK_TEXT_BUFFER_GET_PRIVATE (buffer);
+
+  gtk_text_buffer_get_copy_target_list (buffer);
+
+  while (tmp_list)
     {
-      GtkTextIter start, end;
+      GtkTextIter start;
+      GtkTextIter end;
+      
+      SelectionClipboard *selection_clipboard = tmp_list->data;
+      GtkClipboard *clipboard = selection_clipboard->clipboard;
+
+      /* Determine whether we have a selection and adjust X selection
+       * accordingly.
+       */
+      if (!gtk_text_buffer_get_selection_bounds (buffer, &start, &end))
+       {
+         if (gtk_clipboard_get_owner (clipboard) == G_OBJECT (buffer))
+           gtk_clipboard_clear (clipboard);
+       }
+      else
+       {
+         /* Even if we already have the selection, we need to update our
+          * timestamp.
+          */
+         if (!gtk_clipboard_set_with_owner (clipboard,
+                                             priv->copy_target_entries,
+                                             priv->n_copy_target_entries,
+                                            clipboard_get_selection_cb,
+                                            clipboard_clear_selection_cb,
+                                            G_OBJECT (buffer)))
+           clipboard_clear_selection_cb (clipboard, buffer);
+       }
 
-      if (gtk_text_buffer_get_selection_bounds (src_buffer, &start, &end))
-        paste_from_buffer (request_data, src_buffer,
-                           &start, &end);
+      tmp_list = tmp_list->next;
     }
-  else
+}
+
+static SelectionClipboard *
+find_selection_clipboard (GtkTextBuffer *buffer,
+                         GtkClipboard  *clipboard)
+{
+  GSList *tmp_list = buffer->selection_clipboards;
+  while (tmp_list)
     {
-      /* Request the text selection instead */
-      gtk_clipboard_request_text (clipboard,
-                                  clipboard_text_received,
-                                  data);
+      SelectionClipboard *selection_clipboard = tmp_list->data;
+      if (selection_clipboard->clipboard == clipboard)
+       return selection_clipboard;
+      
+      tmp_list = tmp_list->next;
     }
-}
 
-static const GtkTargetEntry targets[] = {
-  { "STRING", 0, TARGET_STRING },
-  { "TEXT",   0, TARGET_TEXT },
-  { "COMPOUND_TEXT", 0, TARGET_COMPOUND_TEXT },
-  { "UTF8_STRING", 0, TARGET_UTF8_STRING },
-  { "GTK_TEXT_BUFFER_CONTENTS", 0, TARGET_TEXT_BUFFER_CONTENTS }
-};
+  return NULL;
+}
 
-static void
-gtk_text_buffer_update_primary_selection (GtkTextBuffer *buffer)
+/**
+ * gtk_text_buffer_add_selection_clipboard:
+ * @buffer: a #GtkTextBuffer
+ * @clipboard: a #GtkClipboard
+ * 
+ * Adds @clipboard to the list of clipboards in which the selection 
+ * contents of @buffer are available. In most cases, @clipboard will be 
+ * the #GtkClipboard of type %GDK_SELECTION_PRIMARY for a view of @buffer.
+ **/
+void
+gtk_text_buffer_add_selection_clipboard (GtkTextBuffer *buffer,
+                                        GtkClipboard  *clipboard)
 {
-  GtkTextIter start;
-  GtkTextIter end;
-
-  GtkClipboard *clipboard = gtk_clipboard_get (GDK_SELECTION_PRIMARY);
+  SelectionClipboard *selection_clipboard;
 
-  /* Determine whether we have a selection and adjust X selection
-   * accordingly.
-   */
+  g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
+  g_return_if_fail (clipboard != NULL);
 
-  if (!gtk_text_buffer_get_selection_bounds (buffer, &start, &end))
+  selection_clipboard = find_selection_clipboard (buffer, clipboard);
+  if (selection_clipboard)
     {
-      if (gtk_clipboard_get_owner (clipboard) == G_OBJECT (buffer))
-        gtk_clipboard_clear (clipboard);
+      selection_clipboard->ref_count++;
     }
   else
     {
-      /* Even if we already have the selection, we need to update our
-       * timestamp.
-       */
-      if (!gtk_clipboard_set_with_owner (clipboard, targets, G_N_ELEMENTS (targets),
-                                         clipboard_get_selection_cb,
-                                         clipboard_clear_selection_cb,
-                                         G_OBJECT (buffer)))
-        clipboard_clear_selection_cb (clipboard, buffer);
+      selection_clipboard = g_new (SelectionClipboard, 1);
+
+      selection_clipboard->clipboard = clipboard;
+      selection_clipboard->ref_count = 1;
+
+      buffer->selection_clipboards = g_slist_prepend (buffer->selection_clipboards, selection_clipboard);
+    }
+}
+
+/**
+ * gtk_text_buffer_remove_selection_clipboard:
+ * @buffer: a #GtkTextBuffer
+ * @clipboard: a #GtkClipboard added to @buffer by 
+ *             gtk_text_buffer_add_selection_clipboard()
+ * 
+ * Removes a #GtkClipboard added with 
+ * gtk_text_buffer_add_selection_clipboard().
+ **/
+void 
+gtk_text_buffer_remove_selection_clipboard (GtkTextBuffer *buffer,
+                                           GtkClipboard  *clipboard)
+{
+  SelectionClipboard *selection_clipboard;
+
+  g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
+  g_return_if_fail (clipboard != NULL);
+
+  selection_clipboard = find_selection_clipboard (buffer, clipboard);
+  g_return_if_fail (selection_clipboard != NULL);
+
+  selection_clipboard->ref_count--;
+  if (selection_clipboard->ref_count == 0)
+    {
+      if (gtk_clipboard_get_owner (selection_clipboard->clipboard) == G_OBJECT (buffer))
+       gtk_clipboard_clear (selection_clipboard->clipboard);
+
+      buffer->selection_clipboards = g_slist_remove (buffer->selection_clipboards,
+                                                     selection_clipboard);
+      
+      g_free (selection_clipboard);
     }
 }
 
 static void
-paste (GtkTextBuffer *buffer,
-       gboolean       is_clipboard,
-       gboolean       interactive,
-       gboolean       default_editable)
+remove_all_selection_clipboards (GtkTextBuffer *buffer)
+{
+  g_slist_foreach (buffer->selection_clipboards, (GFunc)g_free, NULL);
+  g_slist_free (buffer->selection_clipboards);
+  buffer->selection_clipboards = NULL;
+}
+
+/**
+ * gtk_text_buffer_paste_clipboard:
+ * @buffer: a #GtkTextBuffer
+ * @clipboard: the #GtkClipboard to paste from
+ * @override_location: (allow-none): location to insert pasted text, or %NULL for
+ *                     at the cursor
+ * @default_editable: whether the buffer is editable by default
+ *
+ * Pastes the contents of a clipboard at the insertion point, or at
+ * @override_location. (Note: pasting is asynchronous, that is, we'll 
+ * ask for the paste data and return, and at some point later after 
+ * the main loop runs, the paste data will be inserted.)
+ **/
+void
+gtk_text_buffer_paste_clipboard (GtkTextBuffer *buffer,
+                                GtkClipboard  *clipboard,
+                                GtkTextIter   *override_location,
+                                 gboolean       default_editable)
 {
   ClipboardRequest *data = g_new (ClipboardRequest, 1);
   GtkTextIter paste_point;
   GtkTextIter start, end;
-  
-  data->buffer = buffer;
-  g_object_ref (G_OBJECT (buffer));
-  data->interactive = interactive;
+
+  if (override_location != NULL)
+    gtk_text_buffer_create_mark (buffer,
+                                 "gtk_paste_point_override",
+                                 override_location, FALSE);
+
+  data->buffer = g_object_ref (buffer);
+  data->interactive = TRUE;
   data->default_editable = default_editable;
 
   /* When pasting with the cursor inside the selection area, you
@@ -2959,58 +3774,9 @@ paste (GtkTextBuffer *buffer,
        gtk_text_iter_equal (&paste_point, &end)))
     data->replace_selection = TRUE;
 
-  if (is_clipboard)
-    gtk_clipboard_request_contents (gtk_clipboard_get (GDK_NONE),
-                                    
-                                    gdk_atom_intern ("GTK_TEXT_BUFFER_CONTENTS", FALSE),
-                                    clipboard_clipboard_buffer_received, data);
-  else
-    gtk_clipboard_request_contents (gtk_clipboard_get (GDK_SELECTION_PRIMARY),
-                                    
-                                    gdk_atom_intern ("GTK_TEXT_BUFFER_CONTENTS", FALSE),
-                                    clipboard_selection_buffer_received, data);    
-}
-
-/**
- * gtk_text_buffer_paste_primary:
- * @buffer: a #GtkTextBuffer 
- * @override_location: location to insert pasted text, or %NULL for at the cursor
- * @default_editable: whether the buffer is editable by default 
- * 
- * Pastes the primary selection at the insertion point, or at @override_location.
- * (Note: pasting is asynchronous, that is, we'll ask for the paste data
- * and return, and at some point later after the main loop runs, the paste
- * data will be inserted.)
- **/
-void
-gtk_text_buffer_paste_primary (GtkTextBuffer       *buffer,
-                               const GtkTextIter   *override_location,
-                               gboolean             default_editable)
-{
-  if (override_location != NULL)
-    gtk_text_buffer_create_mark (buffer,
-                                 "gtk_paste_point_override",
-                                 override_location, FALSE);
-
-  paste (buffer, FALSE, TRUE, default_editable);
-}
-
-/**
- * gtk_text_buffer_paste_clipboard:
- * @buffer: a #GtkTextBuffer 
- * @default_editable: whether the buffer is editable by default
- *
- * Pastes the clipboard contents at the insertion point.  (Note:
- * pasting is asynchronous, that is, we'll ask for the paste data and
- * return, and at some point later after the main loop runs, the paste
- * data will be inserted.)
- * 
- **/
-void
-gtk_text_buffer_paste_clipboard (GtkTextBuffer *buffer,
-                                 gboolean       default_editable)
-{
-  paste (buffer, TRUE, TRUE, default_editable);
+  gtk_clipboard_request_contents (clipboard,
+                                 gdk_atom_intern_static_string ("GTK_TEXT_BUFFER_CONTENTS"),
+                                 clipboard_clipboard_buffer_received, data);
 }
 
 /**
@@ -3041,11 +3807,7 @@ gtk_text_buffer_delete_selection (GtkTextBuffer *buffer,
   else
     {
       if (interactive)
-        {
-          gtk_text_buffer_begin_user_action (buffer);
-          gtk_text_buffer_delete_interactive (buffer, &start, &end, default_editable);
-          gtk_text_buffer_end_user_action (buffer);
-        }
+        gtk_text_buffer_delete_interactive (buffer, &start, &end, default_editable);
       else
         gtk_text_buffer_delete (buffer, &start, &end);
 
@@ -3053,12 +3815,115 @@ gtk_text_buffer_delete_selection (GtkTextBuffer *buffer,
     }
 }
 
+/**
+ * gtk_text_buffer_backspace:
+ * @buffer: a #GtkTextBuffer
+ * @iter: a position in @buffer
+ * @interactive: whether the deletion is caused by user interaction
+ * @default_editable: whether the buffer is editable by default
+ * 
+ * Performs the appropriate action as if the user hit the delete
+ * key with the cursor at the position specified by @iter. In the
+ * normal case a single character will be deleted, but when
+ * combining accents are involved, more than one character can
+ * be deleted, and when precomposed character and accent combinations
+ * are involved, less than one character will be deleted.
+ * 
+ * Because the buffer is modified, all outstanding iterators become 
+ * invalid after calling this function; however, the @iter will be
+ * re-initialized to point to the location where text was deleted. 
+ *
+ * Return value: %TRUE if the buffer was modified
+ *
+ * Since: 2.6
+ **/
+gboolean
+gtk_text_buffer_backspace (GtkTextBuffer *buffer,
+                          GtkTextIter   *iter,
+                          gboolean       interactive,
+                          gboolean       default_editable)
+{
+  gchar *cluster_text;
+  GtkTextIter start;
+  GtkTextIter end;
+  gboolean retval = FALSE;
+  const PangoLogAttr *attrs;
+  int offset;
+  gboolean backspace_deletes_character;
+
+  g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), FALSE);
+  g_return_val_if_fail (iter != NULL, FALSE);
+
+  start = *iter;
+  end = *iter;
+
+  attrs = _gtk_text_buffer_get_line_log_attrs (buffer, &start, NULL);
+
+  /* For no good reason, attrs is NULL for the empty last line in
+   * a buffer. Special case that here. (#156164)
+   */
+  if (attrs)
+    {
+      offset = gtk_text_iter_get_line_offset (&start);
+      backspace_deletes_character = attrs[offset].backspace_deletes_character;
+    }
+  else
+    backspace_deletes_character = FALSE;
+
+  gtk_text_iter_backward_cursor_position (&start);
+
+  if (gtk_text_iter_equal (&start, &end))
+    return FALSE;
+    
+  cluster_text = gtk_text_iter_get_text (&start, &end);
+
+  if (interactive)
+    gtk_text_buffer_begin_user_action (buffer);
+  
+  if (gtk_text_buffer_delete_interactive (buffer, &start, &end,
+                                         default_editable))
+    {
+      /* special case \r\n, since we never want to reinsert \r */
+      if (backspace_deletes_character && strcmp ("\r\n", cluster_text))
+       {
+         gchar *normalized_text = g_utf8_normalize (cluster_text,
+                                                    strlen (cluster_text),
+                                                    G_NORMALIZE_NFD);
+         glong len = g_utf8_strlen (normalized_text, -1);
+
+         if (len > 1)
+           gtk_text_buffer_insert_interactive (buffer,
+                                               &start,
+                                               normalized_text,
+                                               g_utf8_offset_to_pointer (normalized_text, len - 1) - normalized_text,
+                                               default_editable);
+         
+         g_free (normalized_text);
+       }
+
+      retval = TRUE;
+    }
+  
+  if (interactive)
+    gtk_text_buffer_end_user_action (buffer);
+  
+  g_free (cluster_text);
+
+  /* Revalidate the users iter */
+  *iter = start;
+
+  return retval;
+}
+
 static void
 cut_or_copy (GtkTextBuffer *buffer,
-             gboolean delete_region_after,
-             gboolean interactive,
-             gboolean default_editable)
+            GtkClipboard  *clipboard,
+             gboolean       delete_region_after,
+             gboolean       interactive,
+             gboolean       default_editable)
 {
+  GtkTextBufferPrivate *priv;
+
   /* We prefer to cut the selected region between selection_bound and
    * insertion point. If that region is empty, then we cut the region
    * between the "anchor" and the insertion point (this is for
@@ -3068,13 +3933,11 @@ cut_or_copy (GtkTextBuffer *buffer,
    */
   GtkTextIter start;
   GtkTextIter end;
-  
-  if (buffer->clipboard_contents)
-    {
-      g_object_unref (G_OBJECT (buffer->clipboard_contents));
-      buffer->clipboard_contents = NULL;
-    }
-  
+
+  priv = GTK_TEXT_BUFFER_GET_PRIVATE (buffer);
+
+  gtk_text_buffer_get_copy_target_list (buffer);
+
   if (!gtk_text_buffer_get_selection_bounds (buffer, &start, &end))
     {
       /* Let's try the anchor thing */
@@ -3091,25 +3954,26 @@ cut_or_copy (GtkTextBuffer *buffer,
 
   if (!gtk_text_iter_equal (&start, &end))
     {
-      GtkClipboard *clipboard = gtk_clipboard_get (GDK_NONE);
       GtkTextIter ins;
-      
-      buffer->clipboard_contents =
-        gtk_text_buffer_new (gtk_text_buffer_get_tag_table (buffer));
+      GtkTextBuffer *contents;
+
+      contents = create_clipboard_contents_buffer (buffer);
 
-      gtk_text_buffer_get_iter_at_offset (buffer->clipboard_contents,
-                                          &ins, 0);
+      gtk_text_buffer_get_iter_at_offset (contents, &ins, 0);
       
-      gtk_text_buffer_insert_range (buffer->clipboard_contents,
-                                    &ins,
-                                    &start,
-                                    &end);
+      gtk_text_buffer_insert_range (contents, &ins, &start, &end);
                                     
-      if (!gtk_clipboard_set_with_owner (clipboard, targets, G_N_ELEMENTS (targets),
-                                         clipboard_get_contents_cb,
-                                         clipboard_clear_contents_cb,
-                                         G_OBJECT (buffer)))
-        clipboard_clear_contents_cb (clipboard, buffer);      
+      if (!gtk_clipboard_set_with_data (clipboard,
+                                        priv->copy_target_entries,
+                                        priv->n_copy_target_entries,
+                                       clipboard_get_contents_cb,
+                                       clipboard_clear_contents_cb,
+                                       contents))
+       g_object_unref (contents);
+      else
+       gtk_clipboard_set_can_store (clipboard,
+                                     priv->copy_target_entries + 1,
+                                     priv->n_copy_target_entries - 1);
 
       if (delete_region_after)
         {
@@ -3124,38 +3988,37 @@ cut_or_copy (GtkTextBuffer *buffer,
 
 /**
  * gtk_text_buffer_cut_clipboard:
- * @buffer: a #GtkTextBuffer 
+ * @buffer: a #GtkTextBuffer
+ * @clipboard: the #GtkClipboard object to cut to
  * @default_editable: default editability of the buffer
  *
- * Copies the currently-selected text to the clipboard, then deletes
+ * Copies the currently-selected text to a clipboard, then deletes
  * said text if it's editable.
- * 
  **/
 void
 gtk_text_buffer_cut_clipboard (GtkTextBuffer *buffer,
+                              GtkClipboard  *clipboard,
                                gboolean       default_editable)
 {
   gtk_text_buffer_begin_user_action (buffer);
-  cut_or_copy (buffer, TRUE, TRUE, default_editable);
+  cut_or_copy (buffer, clipboard, TRUE, TRUE, default_editable);
   gtk_text_buffer_end_user_action (buffer);
 }
 
 /**
  * gtk_text_buffer_copy_clipboard:
  * @buffer: a #GtkTextBuffer 
+ * @clipboard: the #GtkClipboard object to copy to
  *
- * Copies the currently-selected text to the clipboard.
- * 
+ * Copies the currently-selected text to a clipboard.
  **/
 void
-gtk_text_buffer_copy_clipboard (GtkTextBuffer *buffer)
+gtk_text_buffer_copy_clipboard (GtkTextBuffer *buffer,
+                               GtkClipboard  *clipboard)
 {
-  gtk_text_buffer_begin_user_action (buffer);
-  cut_or_copy (buffer, FALSE, TRUE, TRUE);
-  gtk_text_buffer_end_user_action (buffer);
+  cut_or_copy (buffer, clipboard, FALSE, TRUE, TRUE);
 }
 
-
 /**
  * gtk_text_buffer_get_selection_bounds:
  * @buffer: a #GtkTextBuffer a #GtkTextBuffer
@@ -3172,9 +4035,9 @@ gtk_text_buffer_copy_clipboard (GtkTextBuffer *buffer)
  * Return value: whether the selection has nonzero length
  **/
 gboolean
-gtk_text_buffer_get_selection_bounds   (GtkTextBuffer      *buffer,
-                                        GtkTextIter        *start,
-                                        GtkTextIter        *end)
+gtk_text_buffer_get_selection_bounds (GtkTextBuffer *buffer,
+                                      GtkTextIter   *start,
+                                      GtkTextIter   *end)
 {
   g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), FALSE);
 
@@ -3192,9 +4055,10 @@ gtk_text_buffer_get_selection_bounds   (GtkTextBuffer      *buffer,
  * gtk_text_buffer_end_user_action() can then be grouped when creating
  * an undo stack. #GtkTextBuffer maintains a count of calls to
  * gtk_text_buffer_begin_user_action() that have not been closed with
- * a call to gtk_text_buffer_end_user_action(), and emits the "begin_user_action"
- * and "end_user_action" signals only for the outermost pair of calls.
- * This allows you to build user actions from other user actions.
+ * a call to gtk_text_buffer_end_user_action(), and emits the 
+ * "begin-user-action" and "end-user-action" signals only for the 
+ * outermost pair of calls. This allows you to build user actions 
+ * from other user actions.
  *
  * The "interactive" buffer mutation functions, such as
  * gtk_text_buffer_insert_interactive(), automatically call begin/end
@@ -3212,7 +4076,7 @@ gtk_text_buffer_begin_user_action (GtkTextBuffer *buffer)
   if (buffer->user_action_count == 1)
     {
       /* Outermost nested user action begin emits the signal */
-      g_signal_emit (G_OBJECT (buffer), signals[BEGIN_USER_ACTION], 0);
+      g_signal_emit (buffer, signals[BEGIN_USER_ACTION], 0);
     }
 }
 
@@ -3234,10 +4098,130 @@ gtk_text_buffer_end_user_action (GtkTextBuffer *buffer)
   if (buffer->user_action_count == 0)
     {
       /* Ended the outermost-nested user action end, so emit the signal */
-      g_signal_emit (G_OBJECT (buffer), signals[END_USER_ACTION], 0);
+      g_signal_emit (buffer, signals[END_USER_ACTION], 0);
+    }
+}
+
+static void
+gtk_text_buffer_free_target_lists (GtkTextBuffer *buffer)
+{
+  GtkTextBufferPrivate *priv = GTK_TEXT_BUFFER_GET_PRIVATE (buffer);
+
+  if (priv->copy_target_list)
+    {
+      gtk_target_list_unref (priv->copy_target_list);
+      priv->copy_target_list = NULL;
+
+      gtk_target_table_free (priv->copy_target_entries,
+                             priv->n_copy_target_entries);
+      priv->copy_target_entries = NULL;
+      priv->n_copy_target_entries = 0;
+    }
+
+  if (priv->paste_target_list)
+    {
+      gtk_target_list_unref (priv->paste_target_list);
+      priv->paste_target_list = NULL;
+
+      gtk_target_table_free (priv->paste_target_entries,
+                             priv->n_paste_target_entries);
+      priv->paste_target_entries = NULL;
+      priv->n_paste_target_entries = 0;
     }
 }
 
+static GtkTargetList *
+gtk_text_buffer_get_target_list (GtkTextBuffer   *buffer,
+                                 gboolean         deserializable,
+                                 GtkTargetEntry **entries,
+                                 gint            *n_entries)
+{
+  GtkTargetList *target_list;
+
+  target_list = gtk_target_list_new (NULL, 0);
+
+  gtk_target_list_add (target_list,
+                       gdk_atom_intern_static_string ("GTK_TEXT_BUFFER_CONTENTS"),
+                       GTK_TARGET_SAME_APP,
+                       GTK_TEXT_BUFFER_TARGET_INFO_BUFFER_CONTENTS);
+
+  gtk_target_list_add_rich_text_targets (target_list,
+                                         GTK_TEXT_BUFFER_TARGET_INFO_RICH_TEXT,
+                                         deserializable,
+                                         buffer);
+
+  gtk_target_list_add_text_targets (target_list,
+                                    GTK_TEXT_BUFFER_TARGET_INFO_TEXT);
+
+  *entries = gtk_target_table_new_from_list (target_list, n_entries);
+
+  return target_list;
+}
+
+/**
+ * gtk_text_buffer_get_copy_target_list:
+ * @buffer: a #GtkTextBuffer
+ *
+ * This function returns the list of targets this text buffer can
+ * provide for copying and as DND source. The targets in the list are
+ * added with %info values from the #GtkTextBufferTargetInfo enum,
+ * using gtk_target_list_add_rich_text_targets() and
+ * gtk_target_list_add_text_targets().
+ *
+ * Return value: the #GtkTargetList
+ *
+ * Since: 2.10
+ **/
+GtkTargetList *
+gtk_text_buffer_get_copy_target_list (GtkTextBuffer *buffer)
+{
+  GtkTextBufferPrivate *priv;
+
+  g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), NULL);
+
+  priv = GTK_TEXT_BUFFER_GET_PRIVATE (buffer);
+
+  if (! priv->copy_target_list)
+    priv->copy_target_list =
+      gtk_text_buffer_get_target_list (buffer, FALSE,
+                                       &priv->copy_target_entries,
+                                       &priv->n_copy_target_entries);
+
+  return priv->copy_target_list;
+}
+
+/**
+ * gtk_text_buffer_get_paste_target_list:
+ * @buffer: a #GtkTextBuffer
+ *
+ * This function returns the list of targets this text buffer supports
+ * for pasting and as DND destination. The targets in the list are
+ * added with %info values from the #GtkTextBufferTargetInfo enum,
+ * using gtk_target_list_add_rich_text_targets() and
+ * gtk_target_list_add_text_targets().
+ *
+ * Return value: the #GtkTargetList
+ *
+ * Since: 2.10
+ **/
+GtkTargetList *
+gtk_text_buffer_get_paste_target_list (GtkTextBuffer *buffer)
+{
+  GtkTextBufferPrivate *priv;
+
+  g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), NULL);
+
+  priv = GTK_TEXT_BUFFER_GET_PRIVATE (buffer);
+
+  if (! priv->paste_target_list)
+    priv->paste_target_list =
+      gtk_text_buffer_get_target_list (buffer, TRUE,
+                                       &priv->paste_target_entries,
+                                       &priv->n_paste_target_entries);
+
+  return priv->paste_target_list;
+}
+
 /*
  * Logical attribute cache
  */
@@ -3252,7 +4236,6 @@ struct _CacheEntry
   PangoLogAttr *attrs;
 };
 
-
 struct _GtkTextLogAttrCache
 {
   gint chars_changed_stamp;
@@ -3308,11 +4291,15 @@ compute_log_attrs (const GtkTextIter *iter,
   if (char_lenp)
     *char_lenp = char_len;
   
-  attrs = g_new (PangoLogAttr, char_len);
-  
+  attrs = g_new (PangoLogAttr, char_len + 1);
+
+  /* FIXME we need to follow PangoLayout and allow different language
+   * tags within the paragraph
+   */
   pango_get_log_attrs (paragraph, byte_len, -1,
                       gtk_text_iter_get_language (&start),
-                       attrs);
+                       attrs,
+                       char_len + 1);
   
   g_free (paragraph);
 
@@ -3332,8 +4319,16 @@ _gtk_text_buffer_get_line_log_attrs (GtkTextBuffer     *buffer,
   
   g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), NULL);
   g_return_val_if_fail (anywhere_in_line != NULL, NULL);
-  g_return_val_if_fail (!gtk_text_iter_is_end (anywhere_in_line), NULL);
 
+  /* special-case for empty last line in buffer */
+  if (gtk_text_iter_is_end (anywhere_in_line) &&
+      gtk_text_iter_get_line_offset (anywhere_in_line) == 0)
+    {
+      if (char_len)
+        *char_len = 0;
+      return NULL;
+    }
+  
   /* FIXME we also need to recompute log attrs if the language tag at
    * the start of a paragraph changes
    */
@@ -3367,8 +4362,7 @@ _gtk_text_buffer_get_line_log_attrs (GtkTextBuffer     *buffer,
     }
   
   /* Not in cache; open up the first cache entry */
-  if (cache->entries[ATTR_CACHE_SIZE-1].attrs)
-    g_free (cache->entries[ATTR_CACHE_SIZE-1].attrs);
+  g_free (cache->entries[ATTR_CACHE_SIZE-1].attrs);
   
   g_memmove (cache->entries + 1, cache->entries,
              sizeof (CacheEntry) * (ATTR_CACHE_SIZE - 1));
@@ -3383,6 +4377,19 @@ _gtk_text_buffer_get_line_log_attrs (GtkTextBuffer     *buffer,
   return cache->entries[0].attrs;
 }
 
+void
+_gtk_text_buffer_notify_will_remove_tag (GtkTextBuffer *buffer,
+                                         GtkTextTag    *tag)
+{
+  /* This removes tag from the buffer, but DOESN'T emit the
+   * remove-tag signal, because we can't afford to have user
+   * code messing things up at this point; the tag MUST be removed
+   * entirely.
+   */
+  if (buffer->btree)
+    _gtk_text_btree_notify_will_remove_tag (buffer->btree, tag);
+}
+
 /*
  * Debug spew
  */
@@ -3393,7 +4400,5 @@ _gtk_text_buffer_spew (GtkTextBuffer *buffer)
   _gtk_text_btree_spew (get_btree (buffer));
 }
 
-
-
-
-
+#define __GTK_TEXT_BUFFER_C__
+#include "gtkaliasdef.c"