]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtktextbuffer.c
filechooserbutton: Don't show the (None) item when the combo box is popped up
[~andy/gtk] / gtk / gtktextbuffer.c
index a686a4531f3b21a94404b6cd1a81329a1787bb1c..a877e345995348e4ce5b57406de23301a25f93ef 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
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the GNU
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
  * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
  * file for a list of people on the GTK+ Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ * 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 "gtktexttagprivate.h"
+#include "gtkprivate.h"
+#include "gtkintl.h"
+
+
+/**
+ * SECTION:gtktextbuffer
+ * @Short_description: Stores attributed text for display in a GtkTextView
+ * @Title: GtkTextBuffer
+ * @See_also: #GtkTextView, #GtkTextIter, #GtkTextMark
+ *
+ * You may wish to begin by reading the <link linkend="TextWidget">text widget
+ * conceptual overview</link> which gives an overview of all the objects and data
+ * types related to the text widget and how they work together.
+ */
+
+
+typedef struct _GtkTextLogAttrCache GtkTextLogAttrCache;
+
+struct _GtkTextBufferPrivate
+{
+  GtkTargetList  *copy_target_list;
+  GtkTargetEntry *copy_target_entries;
+  GtkTargetList  *paste_target_list;
+  GtkTargetEntry *paste_target_entries;
+
+  gint            n_copy_target_entries;
+  gint            n_paste_target_entries;
+
+  GtkTextTagTable *tag_table;
+  GtkTextBTree *btree;
+
+  GSList *clipboard_contents_buffers;
+  GSList *selection_clipboards;
+
+  GtkTextLogAttrCache *log_attr_cache;
+
+  guint user_action_count;
+
+  /* Whether the buffer has been modified since last save */
+  guint modified : 1;
+  guint has_selection : 1;
+};
+
 
 typedef struct _ClipboardRequest ClipboardRequest;
 
 struct _ClipboardRequest
 {
   GtkTextBuffer *buffer;
-  gboolean interactive;
-  gboolean default_editable;
-  gboolean is_clipboard;
+  guint interactive : 1;
+  guint default_editable : 1;
+  guint replace_selection : 1;
 };
 
 enum {
   INSERT_TEXT,
-  DELETE_TEXT,
+  INSERT_PIXBUF,
+  INSERT_CHILD_ANCHOR,
+  DELETE_RANGE,
   CHANGED,
   MODIFIED_CHANGED,
   MARK_SET,
   MARK_DELETED,
   APPLY_TAG,
   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
+  /* 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_destroy    (GtkObject          *object);
 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,
-                                                        gint               len,
-                                                        gboolean           interactive);
-static void gtk_text_buffer_real_delete_text           (GtkTextBuffer     *buffer,
+                                                        gint               len);
+static void gtk_text_buffer_real_insert_pixbuf         (GtkTextBuffer     *buffer,
+                                                        GtkTextIter       *iter,
+                                                        GdkPixbuf         *pixbuf);
+static void gtk_text_buffer_real_insert_anchor         (GtkTextBuffer     *buffer,
+                                                        GtkTextIter       *iter,
+                                                        GtkTextChildAnchor *anchor);
+static void gtk_text_buffer_real_delete_range          (GtkTextBuffer     *buffer,
                                                         GtkTextIter       *start,
-                                                        GtkTextIter       *end,
-                                                        gboolean           interactive);
+                                                        GtkTextIter       *end);
 static void gtk_text_buffer_real_apply_tag             (GtkTextBuffer     *buffer,
                                                         GtkTextTag        *tag,
                                                         const GtkTextIter *start_char,
@@ -93,259 +145,687 @@ static void gtk_text_buffer_real_remove_tag            (GtkTextBuffer     *buffe
                                                         GtkTextTag        *tag,
                                                         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);
 
-void gtk_marshal_NONE__INT_POINTER_INT (GtkObject  *object,
-                                        GtkSignalFunc func,
-                                        gpointer func_data,
-                                        GtkArg  *args);
+static void remove_all_selection_clipboards       (GtkTextBuffer *buffer);
+static void update_selection_clipboards           (GtkTextBuffer *buffer);
 
-static GtkObjectClass *parent_class = NULL;
-static guint signals[LAST_SIGNAL] = { 0 };
+static GtkTextBuffer *create_clipboard_contents_buffer (GtkTextBuffer *buffer);
 
-GtkType
-gtk_text_buffer_get_type (void)
-{
-  static GtkType our_type = 0;
+static void gtk_text_buffer_free_target_lists     (GtkTextBuffer *buffer);
 
-  if (our_type == 0)
-    {
-      static const GtkTypeInfo our_info =
-      {
-        "GtkTextBuffer",
-        sizeof (GtkTextBuffer),
-        sizeof (GtkTextBufferClass),
-        (GtkClassInitFunc) gtk_text_buffer_class_init,
-        (GtkObjectInitFunc) gtk_text_buffer_init,
-        /* reserved_1 */ NULL,
-        /* reserved_2 */ NULL,
-        (GtkClassInitFunc) NULL
-      };
+static guint signals[LAST_SIGNAL] = { 0 };
 
-      our_type = gtk_type_unique (GTK_TYPE_OBJECT, &our_info);
-    }
+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);
 
-  return our_type;
-}
+G_DEFINE_TYPE (GtkTextBuffer, gtk_text_buffer, G_TYPE_OBJECT)
 
 static void
 gtk_text_buffer_class_init (GtkTextBufferClass *klass)
 {
-  GtkObjectClass *object_class = (GtkObjectClass*) klass;
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-  parent_class = gtk_type_class (GTK_TYPE_OBJECT);
+  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;
+  klass->delete_range = gtk_text_buffer_real_delete_range;
+  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] =
-    gtk_signal_new ("insert_text",
-                    GTK_RUN_LAST,
-                    GTK_CLASS_TYPE (object_class),
-                    GTK_SIGNAL_OFFSET (GtkTextBufferClass, insert_text),
-                    gtk_marshal_NONE__POINTER_POINTER_INT_INT,
-                    GTK_TYPE_NONE,
-                    4,
-                    GTK_TYPE_POINTER,
-                    GTK_TYPE_POINTER,
-                    GTK_TYPE_INT,
-                    GTK_TYPE_BOOL);
-
-  signals[DELETE_TEXT] =
-    gtk_signal_new ("delete_text",
-                    GTK_RUN_LAST,
-                    GTK_CLASS_TYPE (object_class),
-                    GTK_SIGNAL_OFFSET (GtkTextBufferClass, delete_text),
-                    gtk_marshal_NONE__POINTER_POINTER_INT,
-                    GTK_TYPE_NONE,
-                    3,
-                    GTK_TYPE_POINTER,
-                    GTK_TYPE_POINTER,
-                    GTK_TYPE_BOOL);
-
+    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,
+                  G_TYPE_NONE,
+                  3,
+                  GTK_TYPE_TEXT_ITER | G_SIGNAL_TYPE_STATIC_SCOPE,
+                  G_TYPE_STRING | G_SIGNAL_TYPE_STATIC_SCOPE,
+                  G_TYPE_INT);
+  g_signal_set_va_marshaller (signals[INSERT_TEXT], G_TYPE_FROM_CLASS (klass),
+                              _gtk_marshal_VOID__BOXED_STRING_INTv);
+
+  /**
+   * 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 (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,
+                  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 (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,
+                  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 (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,
+                  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] =
-    gtk_signal_new ("changed",
-                    GTK_RUN_LAST,
-                    GTK_CLASS_TYPE (object_class),
-                    GTK_SIGNAL_OFFSET (GtkTextBufferClass, changed),
-                    gtk_marshal_NONE__NONE,
-                    GTK_TYPE_NONE,
-                    0);
-
+    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,
+                  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] =
-    gtk_signal_new ("modified_changed",
-                    GTK_RUN_LAST,
-                    GTK_CLASS_TYPE (object_class),
-                    GTK_SIGNAL_OFFSET (GtkTextBufferClass, modified_changed),
-                    gtk_marshal_NONE__NONE,
-                    GTK_TYPE_NONE,
-                    0);
-  
+    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,
+                  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] =
-    gtk_signal_new ("mark_set",
-                    GTK_RUN_LAST,
-                    GTK_CLASS_TYPE (object_class),
-                    GTK_SIGNAL_OFFSET (GtkTextBufferClass, mark_set),
-                    gtk_marshal_NONE__POINTER_POINTER,
-                    GTK_TYPE_NONE,
-                    2,
-                    GTK_TYPE_POINTER,
-                    GTK_TYPE_POINTER);
-
+    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,
+                  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] =
-    gtk_signal_new ("mark_deleted",
-                    GTK_RUN_LAST,
-                    GTK_CLASS_TYPE (object_class),
-                    GTK_SIGNAL_OFFSET (GtkTextBufferClass, mark_deleted),
-                    gtk_marshal_NONE__POINTER,
-                    GTK_TYPE_NONE,
-                    1,
-                    GTK_TYPE_POINTER);
-
+    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,
+                  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] =
-    gtk_signal_new ("apply_tag",
-                    GTK_RUN_LAST,
-                    GTK_CLASS_TYPE (object_class),
-                    GTK_SIGNAL_OFFSET (GtkTextBufferClass, apply_tag),
-                    gtk_marshal_NONE__POINTER_POINTER_POINTER,
-                    GTK_TYPE_NONE,
-                    3,
-                    GTK_TYPE_POINTER,
-                    GTK_TYPE_POINTER,
-                    GTK_TYPE_POINTER);
-    
+    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,
+                  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] =
-    gtk_signal_new ("remove_tag",
-                    GTK_RUN_LAST,
-                    GTK_CLASS_TYPE (object_class),
-                    GTK_SIGNAL_OFFSET (GtkTextBufferClass, remove_tag),
-                    gtk_marshal_NONE__POINTER_POINTER_POINTER,
-                    GTK_TYPE_NONE,
-                    3,
-                    GTK_TYPE_POINTER,
-                    GTK_TYPE_POINTER,
-                    GTK_TYPE_POINTER);
-  
-  gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
+    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,
+                  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 (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,
+                  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 (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,
+                  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));
+}
 
-  object_class->destroy = gtk_text_buffer_destroy;
+static void
+gtk_text_buffer_init (GtkTextBuffer *buffer)
+{
+  buffer->priv = G_TYPE_INSTANCE_GET_PRIVATE (buffer,
+                                              GTK_TYPE_TEXT_BUFFER,
+                                              GtkTextBufferPrivate);
 
-  gobject_class->finalize = gtk_text_buffer_finalize;
+  buffer->priv->clipboard_contents_buffers = NULL;
+  buffer->priv->tag_table = NULL;
 
-  klass->insert_text = gtk_text_buffer_real_insert_text;
-  klass->delete_text = gtk_text_buffer_real_delete_text;
-  klass->apply_tag = gtk_text_buffer_real_apply_tag;
-  klass->remove_tag = gtk_text_buffer_real_remove_tag;
+  /* 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)
+{
+  GtkTextBufferPrivate *priv = buffer->priv;
+
+  g_return_if_fail (priv->tag_table == NULL);
+
+  if (table)
+    {
+      priv->tag_table = table;
+      g_object_ref (priv->tag_table);
+      _gtk_text_tag_table_add_buffer (table, buffer);
+    }
 }
 
+static GtkTextTagTable*
+get_table (GtkTextBuffer *buffer)
+{
+  GtkTextBufferPrivate *priv = buffer->priv;
+
+  if (priv->tag_table == NULL)
+    {
+      priv->tag_table = gtk_text_tag_table_new ();
+      _gtk_text_tag_table_add_buffer (priv->tag_table, buffer);
+    }
 
-typedef gint (*GtkSignal_NONE__INT_POINTER_INT) (GtkObject  *object,
-                                                 gint pos,
-                                                 const gchar *text,
-                                                 gint len,
-                                                 gpointer user_data);
+  return priv->tag_table;
+}
 
-void 
-gtk_marshal_NONE__INT_POINTER_INT (GtkObject  *object,
-                                   GtkSignalFunc func,
-                                   gpointer func_data,
-                                   GtkArg  *args)
+static void
+gtk_text_buffer_set_property (GObject         *object,
+                              guint            prop_id,
+                              const GValue    *value,
+                              GParamSpec      *pspec)
 {
-  GtkSignal_NONE__INT_POINTER_INT rfunc;
+  GtkTextBuffer *text_buffer;
 
-  rfunc = (GtkSignal_NONE__INT_POINTER_INT) func;
+  text_buffer = GTK_TEXT_BUFFER (object);
 
-  (*rfunc) (object,
-            GTK_VALUE_INT (args[0]),
-            GTK_VALUE_POINTER (args[1]),
-            GTK_VALUE_INT (args[2]),
-            func_data);
+  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;
+    }
 }
 
-void
-gtk_text_buffer_init (GtkTextBuffer *buffer)
+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->priv->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.
- * 
+ *
  * Return value: a new text buffer
  **/
 GtkTextBuffer*
 gtk_text_buffer_new (GtkTextTagTable *table)
 {
   GtkTextBuffer *text_buffer;
-  
-  text_buffer = GTK_TEXT_BUFFER (gtk_type_new (gtk_text_buffer_get_type ()));
 
-  if (table)
-    {
-      text_buffer->tag_table = table;
-      
-      gtk_object_ref (GTK_OBJECT(text_buffer->tag_table));
-      gtk_object_sink (GTK_OBJECT(text_buffer->tag_table));
-    } 
-  
+  text_buffer = g_object_new (GTK_TYPE_TEXT_BUFFER, "tag-table", table, NULL);
+
   return text_buffer;
 }
 
 static void
-gtk_text_buffer_destroy (GtkObject *object)
+gtk_text_buffer_finalize (GObject *object)
 {
   GtkTextBuffer *buffer;
+  GtkTextBufferPrivate *priv;
 
   buffer = GTK_TEXT_BUFFER (object);
+  priv = buffer->priv;
 
-  if (buffer->tag_table)
+  remove_all_selection_clipboards (buffer);
+
+  if (priv->tag_table)
     {
-      gtk_object_unref(GTK_OBJECT(buffer->tag_table));
-      buffer->tag_table = NULL;
+      _gtk_text_tag_table_remove_buffer (priv->tag_table, buffer);
+      g_object_unref (priv->tag_table);
+      priv->tag_table = NULL;
     }
 
-  if (buffer->btree)
+  if (priv->btree)
     {
-      gtk_text_btree_unref(buffer->btree);
-      buffer->btree = NULL;
+      _gtk_text_btree_unref (priv->btree);
+      priv->btree = NULL;
     }
-  
-  (* parent_class->destroy) (object);
-}
-
-static void
-gtk_text_buffer_finalize (GObject *object)
-{
-  GtkTextBuffer *tkxt_buffer;
-
-  tkxt_buffer = GTK_TEXT_BUFFER (object);
 
-  G_OBJECT_CLASS (parent_class)->finalize (object);
-}
+  if (priv->log_attr_cache)
+    free_log_attr_cache (priv->log_attr_cache);
 
-static GtkTextTagTable*
-get_table (GtkTextBuffer *buffer)
-{
-  if (buffer->tag_table == NULL)
-    {
-      buffer->tag_table = gtk_text_tag_table_new ();
+  priv->log_attr_cache = NULL;
 
-      gtk_object_ref (GTK_OBJECT(buffer->tag_table));
-      gtk_object_sink (GTK_OBJECT(buffer->tag_table));
-    }
+  gtk_text_buffer_free_target_lists (buffer);
 
-  return buffer->tag_table;
+  G_OBJECT_CLASS (gtk_text_buffer_parent_class)->finalize (object);
 }
 
 static GtkTextBTree*
 get_btree (GtkTextBuffer *buffer)
 {
-  if (buffer->btree == NULL)
-    buffer->btree = gtk_text_btree_new(gtk_text_buffer_get_tag_table (buffer),
+  GtkTextBufferPrivate *priv = buffer->priv;
+
+  if (priv->btree == NULL)
+    priv->btree = _gtk_text_btree_new (gtk_text_buffer_get_tag_table (buffer),
                                        buffer);
-  
-  return buffer->btree;
+
+  return priv->btree;
 }
 
 GtkTextBTree*
@@ -357,15 +837,15 @@ _gtk_text_buffer_get_btree (GtkTextBuffer *buffer)
 /**
  * gtk_text_buffer_get_tag_table:
  * @buffer: a #GtkTextBuffer
- * 
+ *
  * 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);
+  g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), NULL);
 
   return get_table (buffer);
 }
@@ -375,12 +855,9 @@ gtk_text_buffer_get_tag_table (GtkTextBuffer  *buffer)
  * @buffer: a #GtkTextBuffer
  * @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,
@@ -388,21 +865,15 @@ gtk_text_buffer_set_text (GtkTextBuffer *buffer,
                           gint           len)
 {
   GtkTextIter start, end;
-  
-  g_return_if_fail (GTK_IS_TEXT_BUFFER(buffer));
+
+  g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
   g_return_if_fail (text != NULL);
 
   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);
 
   if (len > 0)
@@ -410,47 +881,50 @@ 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,
-                                 gboolean interactive)
+gtk_text_buffer_real_insert_text (GtkTextBuffer *buffer,
+                                  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_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
+  g_return_if_fail (iter != NULL);
   
-  gtk_signal_emit(GTK_OBJECT(buffer), signals[CHANGED]);
+  _gtk_text_btree_insert (iter, text, len);
 
-  gtk_text_buffer_set_modified(buffer, TRUE);
+  g_signal_emit (buffer, signals[CHANGED], 0);
+  g_object_notify (G_OBJECT (buffer), "cursor-position");
 }
 
 static void
-gtk_text_buffer_emit_insert(GtkTextBuffer *buffer,
-                            GtkTextIter *iter,
-                            const gchar *text,
-                            gint len,
-                            gboolean interactive)
+gtk_text_buffer_emit_insert (GtkTextBuffer *buffer,
+                             GtkTextIter   *iter,
+                             const gchar   *text,
+                             gint           len)
 {
-  g_return_if_fail(GTK_IS_TEXT_BUFFER(buffer));
-  g_return_if_fail(iter != NULL);
-  g_return_if_fail(text != NULL);
+  g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
+  g_return_if_fail (iter != NULL);
+  g_return_if_fail (text != NULL);
 
   if (len < 0)
-    len = strlen(text);
+    len = strlen (text);
+
+  g_return_if_fail (g_utf8_validate (text, len, NULL));
   
   if (len > 0)
     {
-      gtk_signal_emit(GTK_OBJECT(buffer), signals[INSERT_TEXT],
-                      iter, text, len, interactive);
+      g_signal_emit (buffer, signals[INSERT_TEXT], 0,
+                     iter, text, len);
     }
 }
 
@@ -458,55 +932,54 @@ gtk_text_buffer_emit_insert(GtkTextBuffer *buffer,
  * gtk_text_buffer_insert:
  * @buffer: a #GtkTextBuffer
  * @iter: a position in the buffer
- * @text: UTF-8 format text to insert
+ * @text: text in UTF-8 format
  * @len: length of text in bytes, or -1
- * 
+ *
  * 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);
-  g_return_if_fail(text != NULL);
+  g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
+  g_return_if_fail (iter != NULL);
+  g_return_if_fail (text != NULL);
+  g_return_if_fail (gtk_text_iter_get_buffer (iter) == buffer);
   
-  gtk_text_buffer_emit_insert(buffer, iter, text, len, FALSE);
+  gtk_text_buffer_emit_insert (buffer, iter, text, len);
 }
 
 /**
  * gtk_text_buffer_insert_at_cursor:
  * @buffer: a #GtkTextBuffer
- * @text: some text in UTF-8 format
+ * @text: text in UTF-8 format
  * @len: length of text, in bytes
- * 
+ *
  * 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;
 
-  g_return_if_fail(GTK_IS_TEXT_BUFFER(buffer));
-  g_return_if_fail(text != NULL);
+  g_return_if_fail (GTK_IS_TEXT_BUFFER (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_iter_at_mark (buffer, &iter,
+                                    gtk_text_buffer_get_insert (buffer));
 
-  gtk_text_buffer_insert(buffer, &iter, text, len);
+  gtk_text_buffer_insert (buffer, &iter, text, len);
 }
 
 /**
@@ -516,27 +989,34 @@ gtk_text_buffer_insert_at_cursor (GtkTextBuffer *buffer,
  * @text: some UTF-8 text
  * @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
+ * @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).
- * 
+ *
+ * @default_editable indicates the editability of text that doesn't
+ * have a tag affecting editability applied to it. Typically the
+ * result of gtk_text_view_get_editable() is appropriate here.
+ *
  * Return value: whether text was actually inserted
  **/
 gboolean
-gtk_text_buffer_insert_interactive(GtkTextBuffer *buffer,
-                                   GtkTextIter   *iter,
-                                   const gchar   *text,
-                                   gint           len,
-                                   gboolean       default_editable)
+gtk_text_buffer_insert_interactive (GtkTextBuffer *buffer,
+                                    GtkTextIter   *iter,
+                                    const gchar   *text,
+                                    gint           len,
+                                    gboolean       default_editable)
 {
-  g_return_val_if_fail(GTK_IS_TEXT_BUFFER(buffer), FALSE);
-  g_return_val_if_fail(text != NULL, FALSE);
-  
-  if (gtk_text_iter_editable (iter, default_editable))
+  g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), FALSE);
+  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_can_insert (iter, default_editable))
     {
-      gtk_text_buffer_emit_insert (buffer, iter, text, len, TRUE);
+      gtk_text_buffer_begin_user_action (buffer);
+      gtk_text_buffer_emit_insert (buffer, iter, text, len);
+      gtk_text_buffer_end_user_action (buffer);
       return TRUE;
     }
   else
@@ -549,9 +1029,13 @@ gtk_text_buffer_insert_interactive(GtkTextBuffer *buffer,
  * @text: text in UTF-8 format
  * @len: length of text in bytes, or -1
  * @default_editable: default editability of buffer
- * 
+ *
  * Calls gtk_text_buffer_insert_interactive() at the cursor
  * position.
+ *
+ * @default_editable indicates the editability of text that doesn't
+ * have a tag affecting editability applied to it. Typically the
+ * result of gtk_text_view_get_editable() is appropriate here.
  * 
  * Return value: whether text was actually inserted
  **/
@@ -563,115 +1047,483 @@ gtk_text_buffer_insert_interactive_at_cursor (GtkTextBuffer *buffer,
 {
   GtkTextIter iter;
 
-  g_return_val_if_fail(GTK_IS_TEXT_BUFFER(buffer), FALSE);
-  g_return_val_if_fail(text != NULL, FALSE);
-  
-  gtk_text_buffer_get_iter_at_mark(buffer, &iter,
-                                   gtk_text_buffer_get_mark (buffer,
-                                                             "insert"));
+  g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), FALSE);
+  g_return_val_if_fail (text != NULL, FALSE);
+
+  gtk_text_buffer_get_iter_at_mark (buffer, &iter,
+                                    gtk_text_buffer_get_insert (buffer));
 
   return gtk_text_buffer_insert_interactive (buffer, &iter, text, len,
                                              default_editable);
 }
 
+static gboolean
+possibly_not_text (gunichar ch,
+                   gpointer user_data)
+{
+  return ch == GTK_TEXT_UNKNOWN_CHAR;
+}
 
-/**
- * gtk_text_buffer_insert_range:
- * @buffer: a #GtkTextBuffer
- * @iter: a position in @buffer
- * @start: a position in a #GtkTextBuffer
- * @end: another position in the same buffer as @start
- *
- * Copies text, tags, and pixbufs between @start and @end (the order
- * of @start and @end doesn't matter) and inserts the copy at @iter.
- * Used instead of simply getting/inserting text because it preserves
- * images and tags. If @start and @end are in a different buffer
- * from @buffer, the two buffers must share the same tag table.
- *
- * Implemented via multiple emissions of the insert_text and
- * apply_tag signals, so expect those.
- **/
-void
-gtk_text_buffer_insert_range (GtkTextBuffer     *buffer,
-                              GtkTextIter       *iter,
-                              const GtkTextIter *start,
-                              const GtkTextIter *end)
+static void
+insert_text_range (GtkTextBuffer     *buffer,
+                   GtkTextIter       *iter,
+                   const GtkTextIter *orig_start,
+                   const GtkTextIter *orig_end,
+                   gboolean           interactive)
 {
-  g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
-  g_return_if_fail (iter != NULL);
-  g_return_if_fail (start != NULL);
-  g_return_if_fail (end != NULL);
-  g_return_if_fail (gtk_text_iter_get_buffer (start) !=
-                    gtk_text_iter_get_buffer (end));
-  g_return_if_fail (gtk_text_iter_get_buffer (start)->tag_table !=
-                    buffer->tag_table);
+  gchar *text;
+
+  text = gtk_text_iter_get_text (orig_start, orig_end);
 
-  /* FIXME */
+  gtk_text_buffer_emit_insert (buffer, iter, text, -1);
+
+  g_free (text);
 }
 
-gboolean
-gtk_text_buffer_insert_range_interactive (GtkTextBuffer     *buffer,
-                                          GtkTextIter       *iter,
-                                          const GtkTextIter *start,
-                                          const GtkTextIter *end,
-                                          gboolean           default_editable)
+typedef struct _Range Range;
+struct _Range
 {
-  g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), FALSE);
-  g_return_val_if_fail (iter != NULL, FALSE);
-  g_return_val_if_fail (start != NULL, FALSE);
-  g_return_val_if_fail (end != NULL, FALSE);
-  g_return_val_if_fail (gtk_text_iter_get_buffer (start) !=
-                        gtk_text_iter_get_buffer (end), FALSE);
-  g_return_val_if_fail (gtk_text_iter_get_buffer (start)->tag_table !=
-                        buffer->tag_table, FALSE);
+  GtkTextBuffer *buffer;
+  GtkTextMark *start_mark;
+  GtkTextMark *end_mark;
+  GtkTextMark *whole_end_mark;
+  GtkTextIter *range_start;
+  GtkTextIter *range_end;
+  GtkTextIter *whole_end;
+};
 
+static Range*
+save_range (GtkTextIter *range_start,
+            GtkTextIter *range_end,
+            GtkTextIter *whole_end)
+{
+  Range *r;
+
+  r = g_new (Range, 1);
 
-  /* FIXME */
+  r->buffer = gtk_text_iter_get_buffer (range_start);
+  g_object_ref (r->buffer);
   
-  return FALSE;
+  r->start_mark = 
+    gtk_text_buffer_create_mark (gtk_text_iter_get_buffer (range_start),
+                                 NULL,
+                                 range_start,
+                                 FALSE);
+  r->end_mark = 
+    gtk_text_buffer_create_mark (gtk_text_iter_get_buffer (range_start),
+                                 NULL,
+                                 range_end,
+                                 TRUE);
+
+  r->whole_end_mark = 
+    gtk_text_buffer_create_mark (gtk_text_iter_get_buffer (range_start),
+                                 NULL,
+                                 whole_end,
+                                 TRUE);
+
+  r->range_start = range_start;
+  r->range_end = range_end;
+  r->whole_end = whole_end;
+
+  return r;
 }
 
-/**
- * gtk_text_buffer_insert_with_tags:
- * @buffer: a #GtkTextBuffer
- * @iter: an iterator in @buffer
- * @text: UTF-8 text
- * @len: length of @text, or -1 
- * @first_tag: first tag to apply to @text
- * @Varargs: NULL-terminated list of tags to apply 
- * 
- * 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.
- **/
-void
-gtk_text_buffer_insert_with_tags (GtkTextBuffer *buffer,
-                                  GtkTextIter   *iter,
-                                  const gchar   *text,
-                                  gint           len,
-                                  GtkTextTag    *first_tag,
-                                  ...)
+static void
+restore_range (Range *r)
 {
-  gint start_offset;
-  GtkTextIter start;
+  gtk_text_buffer_get_iter_at_mark (r->buffer,
+                                    r->range_start,
+                                    r->start_mark);
+      
+  gtk_text_buffer_get_iter_at_mark (r->buffer,
+                                    r->range_end,
+                                    r->end_mark);
+      
+  gtk_text_buffer_get_iter_at_mark (r->buffer,
+                                    r->whole_end,
+                                    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);
+
+  /* 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); 
+}
+
+static void
+insert_range_untagged (GtkTextBuffer     *buffer,
+                       GtkTextIter       *iter,
+                       const GtkTextIter *orig_start,
+                       const GtkTextIter *orig_end,
+                       gboolean           interactive)
+{
+  GtkTextIter range_start;
+  GtkTextIter range_end;
+  GtkTextIter start, end;
+  Range *r;
+  
+  if (gtk_text_iter_equal (orig_start, orig_end))
+    return;
+
+  start = *orig_start;
+  end = *orig_end;
+  
+  range_start = start;
+  range_end = start;
+  
+  while (TRUE)
+    {
+      if (gtk_text_iter_equal (&range_start, &range_end))
+        {
+          /* Figure out how to move forward */
+
+          g_assert (gtk_text_iter_compare (&range_end, &end) <= 0);
+          
+          if (gtk_text_iter_equal (&range_end, &end))
+            {
+              /* nothing left to do */
+              break;
+            }
+          else if (gtk_text_iter_get_char (&range_end) == GTK_TEXT_UNKNOWN_CHAR)
+            {
+              GdkPixbuf *pixbuf = NULL;
+              GtkTextChildAnchor *anchor = NULL;
+              pixbuf = gtk_text_iter_get_pixbuf (&range_end);
+              anchor = gtk_text_iter_get_child_anchor (&range_end);
+
+              if (pixbuf)
+                {
+                  r = save_range (&range_start,
+                                  &range_end,
+                                  &end);
+
+                  gtk_text_buffer_insert_pixbuf (buffer,
+                                                 iter,
+                                                 pixbuf);
+
+                  restore_range (r);
+                  r = NULL;
+                  
+                  gtk_text_iter_forward_char (&range_end);
+                  
+                  range_start = range_end;
+                }
+              else if (anchor)
+                {
+                  /* Just skip anchors */
+
+                  gtk_text_iter_forward_char (&range_end);
+                  range_start = range_end;
+                }
+              else
+                {
+                  /* The GTK_TEXT_UNKNOWN_CHAR was in a text segment, so
+                   * keep going. 
+                   */
+                  gtk_text_iter_forward_find_char (&range_end,
+                                                   possibly_not_text, NULL,
+                                                   &end);
+                  
+                  g_assert (gtk_text_iter_compare (&range_end, &end) <= 0);
+                }
+            }
+          else
+            {
+              /* Text segment starts here, so forward search to
+               * find its possible endpoint
+               */
+              gtk_text_iter_forward_find_char (&range_end,
+                                               possibly_not_text, NULL,
+                                               &end);
+              
+              g_assert (gtk_text_iter_compare (&range_end, &end) <= 0);
+            }
+        }
+      else
+        {
+          r = save_range (&range_start,
+                          &range_end,
+                          &end);
+          
+          insert_text_range (buffer,
+                             iter,
+                             &range_start,
+                             &range_end,
+                             interactive);
+
+          restore_range (r);
+          r = NULL;
+          
+          range_start = range_end;
+        }
+    }
+}
+
+static void
+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.
+   */
+  GtkTextIter start = *orig_start;
+  GtkTextIter end = *orig_end;
+  GtkTextIter range_start;
+  GtkTextIter range_end;
+  
+  if (gtk_text_iter_equal (orig_start, orig_end))
+    return;
+  
+  gtk_text_iter_order (&start, &end);
+
+  range_start = 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 */
+
+      g_assert (gtk_text_iter_compare (&range_start, &end) < 0);
+      
+      gtk_text_iter_forward_to_tag_toggle (&range_end, NULL);
+
+      g_assert (!gtk_text_iter_equal (&range_start, &range_end));
+
+      /* Clamp to the end iterator */
+      if (gtk_text_iter_compare (&range_end, &end) > 0)
+        range_end = end;
+      
+      /* We have a range with unique tags; insert it, and
+       * apply all tags.
+       */
+      start_offset = gtk_text_iter_get_offset (iter);
+
+      r = save_range (&range_start, &range_end, &end);
+      
+      insert_range_untagged (buffer, iter, &range_start, &range_end, interactive);
+
+      restore_range (r);
+      r = NULL;
+      
+      gtk_text_buffer_get_iter_at_offset (buffer, &start_iter, start_offset);
+      
+      tags = gtk_text_iter_get_tags (&range_start);
+      tmp_list = tags;
+      while (tmp_list != NULL)
+        {
+          gtk_text_buffer_apply_tag (buffer,
+                                     tmp_list->data,
+                                     &start_iter,
+                                     iter);
+          
+          tmp_list = g_slist_next (tmp_list);
+        }
+      g_slist_free (tags);
+
+      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);
+}
+
+/**
+ * gtk_text_buffer_insert_range:
+ * @buffer: a #GtkTextBuffer
+ * @iter: a position in @buffer
+ * @start: a position in a #GtkTextBuffer
+ * @end: another position in the same buffer as @start
+ *
+ * Copies text, tags, and pixbufs between @start and @end (the order
+ * of @start and @end doesn't matter) and inserts the copy at @iter.
+ * Used instead of simply getting/inserting text because it preserves
+ * images and tags. If @start and @end are in a different buffer from
+ * @buffer, the two buffers must share the same tag table.
+ *
+ * Implemented via emissions of the insert_text and apply_tag signals,
+ * so expect those.
+ **/
+void
+gtk_text_buffer_insert_range (GtkTextBuffer     *buffer,
+                              GtkTextIter       *iter,
+                              const GtkTextIter *start,
+                              const GtkTextIter *end)
+{
+  g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
+  g_return_if_fail (iter != NULL);
+  g_return_if_fail (start != NULL);
+  g_return_if_fail (end != NULL);
+  g_return_if_fail (gtk_text_iter_get_buffer (start) ==
+                    gtk_text_iter_get_buffer (end));
+  g_return_if_fail (gtk_text_iter_get_buffer (start)->priv->tag_table ==
+                    buffer->priv->tag_table);
+  g_return_if_fail (gtk_text_iter_get_buffer (iter) == buffer);
+  
+  gtk_text_buffer_real_insert_range (buffer, iter, start, end, FALSE);
+}
+
+/**
+ * gtk_text_buffer_insert_range_interactive:
+ * @buffer: a #GtkTextBuffer
+ * @iter: a position in @buffer
+ * @start: a position in a #GtkTextBuffer
+ * @end: another position in the same buffer as @start
+ * @default_editable: default editability of the buffer
+ *
+ * Same as gtk_text_buffer_insert_range(), but does nothing if the
+ * insertion point isn't editable. The @default_editable parameter
+ * indicates whether the text is editable at @iter if no tags
+ * enclosing @iter affect editability. Typically the result of
+ * gtk_text_view_get_editable() is appropriate here.
+ *
+ * Returns: whether an insertion was possible at @iter
+ **/
+gboolean
+gtk_text_buffer_insert_range_interactive (GtkTextBuffer     *buffer,
+                                          GtkTextIter       *iter,
+                                          const GtkTextIter *start,
+                                          const GtkTextIter *end,
+                                          gboolean           default_editable)
+{
+  g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), FALSE);
+  g_return_val_if_fail (iter != NULL, FALSE);
+  g_return_val_if_fail (start != NULL, FALSE);
+  g_return_val_if_fail (end != NULL, FALSE);
+  g_return_val_if_fail (gtk_text_iter_get_buffer (start) ==
+                        gtk_text_iter_get_buffer (end), FALSE);
+  g_return_val_if_fail (gtk_text_iter_get_buffer (start)->priv->tag_table ==
+                        buffer->priv->tag_table, FALSE);
+
+  if (gtk_text_iter_can_insert (iter, default_editable))
+    {
+      gtk_text_buffer_real_insert_range (buffer, iter, start, end, TRUE);
+      return TRUE;
+    }
+  else
+    return FALSE;
+}
+
+/**
+ * gtk_text_buffer_insert_with_tags:
+ * @buffer: a #GtkTextBuffer
+ * @iter: an iterator in @buffer
+ * @text: UTF-8 text
+ * @len: length of @text, or -1
+ * @first_tag: first tag to apply to @text
+ * @...: %NULL-terminated list of tags to apply
+ *
+ * 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.
+ **/
+void
+gtk_text_buffer_insert_with_tags (GtkTextBuffer *buffer,
+                                  GtkTextIter   *iter,
+                                  const gchar   *text,
+                                  gint           len,
+                                  GtkTextTag    *first_tag,
+                                  ...)
+{
+  gint start_offset;
+  GtkTextIter start;
   va_list args;
   GtkTextTag *tag;
-  
-  g_return_if_fail (GTK_IS_TEXT_BUFFER(buffer));
+
+  g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
   g_return_if_fail (iter != NULL);
   g_return_if_fail (text != NULL);
-
-  start_offset = gtk_text_iter_get_offset (iter);
+  g_return_if_fail (gtk_text_iter_get_buffer (iter) == buffer);
   
+  start_offset = gtk_text_iter_get_offset (iter);
+
   gtk_text_buffer_insert (buffer, iter, text, len);
 
   if (first_tag == NULL)
     return;
-  
+
   gtk_text_buffer_get_iter_at_offset (buffer, &start, start_offset);
-  
+
   va_start (args, first_tag);
   tag = first_tag;
   while (tag)
@@ -691,8 +1543,8 @@ gtk_text_buffer_insert_with_tags (GtkTextBuffer *buffer,
  * @text: UTF-8 text
  * @len: length of @text, or -1
  * @first_tag_name: name of a tag to apply to @text
- * @Varargs: more tag names
- * 
+ * @...: more tag names
+ *
  * Same as gtk_text_buffer_insert_with_tags(), but allows you
  * to pass in tag names instead of tag objects.
  **/
@@ -708,35 +1560,37 @@ gtk_text_buffer_insert_with_tags_by_name  (GtkTextBuffer *buffer,
   GtkTextIter start;
   va_list args;
   const gchar *tag_name;
-  
-  g_return_if_fail (GTK_IS_TEXT_BUFFER(buffer));
+
+  g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
   g_return_if_fail (iter != NULL);
   g_return_if_fail (text != NULL);
-
-  start_offset = gtk_text_iter_get_offset (iter);
+  g_return_if_fail (gtk_text_iter_get_buffer (iter) == buffer);
   
+  start_offset = gtk_text_iter_get_offset (iter);
+
   gtk_text_buffer_insert (buffer, iter, text, len);
 
   if (first_tag_name == NULL)
     return;
-  
+
   gtk_text_buffer_get_iter_at_offset (buffer, &start, start_offset);
-  
+
   va_start (args, first_tag_name);
   tag_name = first_tag_name;
   while (tag_name)
     {
       GtkTextTag *tag;
 
-      tag = gtk_text_tag_table_lookup (buffer->tag_table,
+      tag = gtk_text_tag_table_lookup (buffer->priv->tag_table,
                                        tag_name);
 
       if (tag == NULL)
         {
           g_warning ("%s: no tag with name '%s'!", G_STRLOC, tag_name);
+          va_end (args);
           return;
         }
-      
+
       gtk_text_buffer_apply_tag (buffer, tag, &start, iter);
 
       tag_name = va_arg (args, const gchar*);
@@ -751,52 +1605,50 @@ gtk_text_buffer_insert_with_tags_by_name  (GtkTextBuffer *buffer,
  */
 
 static void
-gtk_text_buffer_real_delete_text(GtkTextBuffer *buffer,
-                                 GtkTextIter *start,
-                                 GtkTextIter *end,
-                                 gboolean interactive)
+gtk_text_buffer_real_delete_range (GtkTextBuffer *buffer,
+                                   GtkTextIter   *start,
+                                   GtkTextIter   *end)
 {
-  g_return_if_fail(GTK_IS_TEXT_BUFFER(buffer));
-  g_return_if_fail(start != NULL);
-  g_return_if_fail(end != NULL);
-  
-  gtk_text_btree_delete(start, 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);
+
+  _gtk_text_btree_delete (start, end);
 
   /* may have deleted the selection... */
-  gtk_text_buffer_update_primary_selection(buffer);
-  
-  gtk_signal_emit(GTK_OBJECT(buffer), signals[CHANGED]);
-  
-  gtk_text_buffer_set_modified(buffer, TRUE);
+  update_selection_clipboards (buffer);
+
+  has_selection = gtk_text_buffer_get_selection_bounds (buffer, NULL, NULL);
+  if (has_selection != buffer->priv->has_selection)
+    {
+      buffer->priv->has_selection = has_selection;
+      g_object_notify (G_OBJECT (buffer), "has-selection");
+    }
+
+  g_signal_emit (buffer, signals[CHANGED], 0);
+  g_object_notify (G_OBJECT (buffer), "cursor-position");
 }
 
 static void
 gtk_text_buffer_emit_delete (GtkTextBuffer *buffer,
                              GtkTextIter *start,
-                             GtkTextIter *end,
-                             gboolean interactive)
+                             GtkTextIter *end)
 {
-  g_return_if_fail(GTK_IS_TEXT_BUFFER(buffer));
-  g_return_if_fail(start != NULL);
-  g_return_if_fail(end != NULL);
+  g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
+  g_return_if_fail (start != NULL);
+  g_return_if_fail (end != NULL);
 
-  if (gtk_text_iter_equal(start, end))
+  if (gtk_text_iter_equal (start, end))
     return;
 
-  gtk_text_iter_reorder (start, end);
+  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.
-   */
-  gtk_signal_emit(GTK_OBJECT(buffer),
-                  signals[DELETE_TEXT],
-                  start, end,
-                  interactive);
+  g_signal_emit (buffer,
+                 signals[DELETE_RANGE],
+                 0,
+                 start, end);
 }
 
 /**
@@ -807,28 +1659,24 @@ gtk_text_buffer_emit_delete (GtkTextBuffer *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_text" signal, and
+ * 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,
                         GtkTextIter   *start,
                         GtkTextIter   *end)
 {
-  g_return_if_fail(GTK_IS_TEXT_BUFFER(buffer));
-  g_return_if_fail(start != NULL);
-  g_return_if_fail(end != NULL);
+  g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
+  g_return_if_fail (start != NULL);
+  g_return_if_fail (end != NULL);
+  g_return_if_fail (gtk_text_iter_get_buffer (start) == buffer);
+  g_return_if_fail (gtk_text_iter_get_buffer (end) == buffer);
   
-  gtk_text_buffer_emit_delete(buffer, start, end, FALSE);
+  gtk_text_buffer_emit_delete (buffer, start, end);
 }
 
 /**
@@ -836,14 +1684,14 @@ gtk_text_buffer_delete (GtkTextBuffer *buffer,
  * @buffer: a #GtkTextBuffer
  * @start_iter: start of range to delete
  * @end_iter: end of range
- * @default_editable: whether the buffer is editable by default 
- * 
+ * @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
  * [@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.
- * 
+ *
  * Return value: whether some text was actually deleted
  **/
 gboolean
@@ -859,21 +1707,27 @@ gtk_text_buffer_delete_interactive (GtkTextBuffer *buffer,
   gboolean deleted_stuff = FALSE;
 
   /* Delete all editable text in the range start_iter, end_iter */
-  
-  g_return_val_if_fail(GTK_IS_TEXT_BUFFER(buffer), FALSE);
+
+  g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), FALSE);
   g_return_val_if_fail (start_iter != NULL, FALSE);
   g_return_val_if_fail (end_iter != NULL, FALSE);
+  g_return_val_if_fail (gtk_text_iter_get_buffer (start_iter) == buffer, FALSE);
+  g_return_val_if_fail (gtk_text_iter_get_buffer (end_iter) == buffer, FALSE);
 
-  gtk_text_iter_reorder (start_iter, end_iter);
   
-  start_mark = gtk_text_buffer_create_mark (buffer, NULL, 
+  gtk_text_buffer_begin_user_action (buffer);
+  
+  gtk_text_iter_order (start_iter, end_iter);
+
+  start_mark = gtk_text_buffer_create_mark (buffer, NULL,
                                             start_iter, TRUE);
-  end_mark = gtk_text_buffer_create_mark (buffer, NULL, 
+  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);
-  
+
   while (TRUE)
     {
       gboolean new_state;
@@ -881,9 +1735,9 @@ gtk_text_buffer_delete_interactive (GtkTextBuffer *buffer,
       GtkTextIter end;
 
       gtk_text_iter_forward_to_tag_toggle (&iter, NULL);
-      
+
       gtk_text_buffer_get_iter_at_mark (buffer, &end, end_mark);
-      
+
       if (gtk_text_iter_compare (&iter, &end) >= 0)
         {
           done = TRUE;
@@ -900,11 +1754,11 @@ gtk_text_buffer_delete_interactive (GtkTextBuffer *buffer,
                 {
                   /* We're ending an editable region. Delete said region. */
                   GtkTextIter start;
-                  
+
                   gtk_text_buffer_get_iter_at_mark (buffer, &start, start_mark);
-                  
-                  gtk_text_buffer_emit_delete (buffer, &start, &iter, TRUE);
-                  
+
+                  gtk_text_buffer_emit_delete (buffer, &start, &iter);
+
                   deleted_stuff = TRUE;
 
                   /* revalidate user's iterators. */
@@ -922,12 +1776,18 @@ gtk_text_buffer_delete_interactive (GtkTextBuffer *buffer,
         {
           /* End of an editable region. Delete it. */
           GtkTextIter start;
-          
+
           gtk_text_buffer_get_iter_at_mark (buffer, &start, start_mark);
-          
-          gtk_text_buffer_emit_delete (buffer, &start, &iter, TRUE);
 
-          current_state = FALSE;
+          gtk_text_buffer_emit_delete (buffer, &start, &iter);
+
+         /* 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. */
@@ -940,11 +1800,9 @@ gtk_text_buffer_delete_interactive (GtkTextBuffer *buffer,
            * the previous region. Move start mark to start of this region.
            */
 
-          g_assert (!current_state && new_state);          
-          
-          gtk_text_buffer_move_mark (buffer, start_mark,
-                                     &iter);
+          g_assert (!current_state && new_state);
 
+          gtk_text_buffer_move_mark (buffer, start_mark, &iter);
 
           current_state = TRUE;
         }
@@ -953,9 +1811,10 @@ gtk_text_buffer_delete_interactive (GtkTextBuffer *buffer,
         break;
     }
 
-  
   gtk_text_buffer_delete_mark (buffer, start_mark);
   gtk_text_buffer_delete_mark (buffer, end_mark);
+
+  gtk_text_buffer_end_user_action (buffer);
   
   return deleted_stuff;
 }
@@ -970,31 +1829,33 @@ gtk_text_buffer_delete_interactive (GtkTextBuffer *buffer,
  * @start: start of a range
  * @end: end of a range
  * @include_hidden_chars: whether to include invisible text
- * 
+ *
  * 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().
- * 
+ *
  * 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);
-  g_return_val_if_fail(end != NULL, NULL);
-
+  g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), NULL);
+  g_return_val_if_fail (start != NULL, NULL);
+  g_return_val_if_fail (end != NULL, NULL);
+  g_return_val_if_fail (gtk_text_iter_get_buffer (start) == buffer, NULL);
+  g_return_val_if_fail (gtk_text_iter_get_buffer (end) == buffer, NULL);
+  
   if (include_hidden_chars)
-    return gtk_text_iter_get_text(start, end);
+    return gtk_text_iter_get_text (start, end);
   else
-    return gtk_text_iter_get_visible_text(start, end);
+    return gtk_text_iter_get_visible_text (start, end);
 }
 
 /**
@@ -1002,55 +1863,159 @@ gtk_text_buffer_get_text (GtkTextBuffer      *buffer,
  * @buffer: a #GtkTextBuffer
  * @start: start of a range
  * @end: end of a range
- * @include_hidden_chars: whether to include invisible text 
+ * @include_hidden_chars: whether to include invisible text
  *
  * 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
- * 0xFFFD character whenever the buffer contains
+ * @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().
- * 
+ * 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);
-  g_return_val_if_fail(end != NULL, NULL);
-
+  g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), NULL);
+  g_return_val_if_fail (start != NULL, NULL);
+  g_return_val_if_fail (end != NULL, NULL);
+  g_return_val_if_fail (gtk_text_iter_get_buffer (start) == buffer, NULL);
+  g_return_val_if_fail (gtk_text_iter_get_buffer (end) == buffer, NULL);
+  
   if (include_hidden_chars)
-    return gtk_text_iter_get_slice(start, end);
+    return gtk_text_iter_get_slice (start, end);
   else
-    return gtk_text_iter_get_visible_slice(start, end);
+    return gtk_text_iter_get_visible_slice (start, end);
 }
 
 /*
- * Pixmaps
+ * Pixbufs
  */
 
+static void
+gtk_text_buffer_real_insert_pixbuf (GtkTextBuffer *buffer,
+                                    GtkTextIter   *iter,
+                                    GdkPixbuf     *pixbuf)
+{ 
+  _gtk_text_btree_insert_pixbuf (iter, pixbuf);
+
+  g_signal_emit (buffer, signals[CHANGED], 0);
+}
+
+/**
+ * gtk_text_buffer_insert_pixbuf:
+ * @buffer: a #GtkTextBuffer
+ * @iter: location to insert the pixbuf
+ * @pixbuf: a #GdkPixbuf
+ *
+ * Inserts an image into the text buffer at @iter. The image will be
+ * counted as one character in character counts, and 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
+ * 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 (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 (buffer, signals[INSERT_PIXBUF], 0,
+                 iter, pixbuf);
+}
+
+/*
+ * Child anchor
+ */
+
+
+static void
+gtk_text_buffer_real_insert_anchor (GtkTextBuffer      *buffer,
+                                    GtkTextIter        *iter,
+                                    GtkTextChildAnchor *anchor)
+{
+  _gtk_text_btree_insert_child_anchor (iter, anchor);
+
+  g_signal_emit (buffer, signals[CHANGED], 0);
+}
+
+/**
+ * gtk_text_buffer_insert_child_anchor:
+ * @buffer: a #GtkTextBuffer
+ * @iter: location to insert the anchor
+ * @anchor: a #GtkTextChildAnchor
+ *
+ * Inserts a child widget anchor into the text buffer at @iter. The
+ * anchor will be counted as one character in character counts, and
+ * 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 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,
+                                     GtkTextIter        *iter,
+                                     GtkTextChildAnchor *anchor)
+{
+  g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
+  g_return_if_fail (iter != NULL);
+  g_return_if_fail (GTK_IS_TEXT_CHILD_ANCHOR (anchor));
+  g_return_if_fail (gtk_text_iter_get_buffer (iter) == buffer);
   
-  gtk_text_btree_insert_pixbuf (iter, pixbuf);
+  g_signal_emit (buffer, signals[INSERT_CHILD_ANCHOR], 0,
+                 iter, anchor);
+}
 
-  /* FIXME pixbuf-specific signal like insert_text */
+/**
+ * gtk_text_buffer_create_child_anchor:
+ * @buffer: a #GtkTextBuffer
+ * @iter: location in the 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(). 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: (transfer none): the created child anchor
+ **/
+GtkTextChildAnchor*
+gtk_text_buffer_create_child_anchor (GtkTextBuffer *buffer,
+                                     GtkTextIter   *iter)
+{
+  GtkTextChildAnchor *anchor;
   
-  gtk_signal_emit (GTK_OBJECT(buffer), signals[CHANGED]);
+  g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), NULL);
+  g_return_val_if_fail (iter != NULL, NULL);
+  g_return_val_if_fail (gtk_text_iter_get_buffer (iter) == buffer, NULL);
   
-  gtk_text_buffer_set_modified (buffer, TRUE);
+  anchor = gtk_text_child_anchor_new ();
+
+  gtk_text_buffer_insert_child_anchor (buffer, iter, anchor);
+
+  g_object_unref (anchor);
+
+  return anchor;
 }
 
 /*
@@ -1059,83 +2024,82 @@ gtk_text_buffer_insert_pixbuf         (GtkTextBuffer      *buffer,
 
 static void
 gtk_text_buffer_mark_set (GtkTextBuffer     *buffer,
-                         const GtkTextIter *location,
+                          const GtkTextIter *location,
                           GtkTextMark       *mark)
 {
-  /* IMO this should NOT work like insert_text and delete_text,
-     where the real action happens in the default handler.
+  /* 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.
+   */
 
-     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 (mark);
 
-  gtk_text_mark_ref (mark);
-  
-  gtk_signal_emit(GTK_OBJECT(buffer),
-                  signals[MARK_SET],
-                  location,
-                  mark);
+  g_signal_emit (buffer,
+                 signals[MARK_SET],
+                 0,
+                 location,
+                 mark);
 
-  gtk_text_mark_unref (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.
- * 
- * Move the mark to the given position, if not @should_exist, create the mark.
- * 
+ *                immediately
+ *
+ * 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;
-  
-  mark = gtk_text_btree_set_mark(get_btree (buffer),
-                                 existing_mark,
-                                 mark_name,
-                                 left_gravity,
-                                 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);
-    }
+  g_return_val_if_fail (gtk_text_iter_get_buffer (iter) == buffer, NULL);
+  
+  mark = _gtk_text_btree_set_mark (get_btree (buffer),
+                                   existing_mark,
+                                   mark_name,
+                                   left_gravity,
+                                   iter,
+                                   should_exist);
   
-  gtk_text_btree_get_iter_at_mark (get_btree (buffer),
+  _gtk_text_btree_get_iter_at_mark (get_btree (buffer),
                                    &location,
                                    mark);
-  
+
   gtk_text_buffer_mark_set (buffer, &location, mark);
 
-  return (GtkTextMark*)mark;
+  return mark;
 }
 
 /**
  * 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
@@ -1146,139 +2110,177 @@ 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
+ *
+ * Return value: (transfer none): the new #GtkTextMark object
  **/
 GtkTextMark*
-gtk_text_buffer_create_mark(GtkTextBuffer *buffer,
-                            const gchar *mark_name,
-                            const GtkTextIter *where,
-                            gboolean left_gravity)
+gtk_text_buffer_create_mark (GtkTextBuffer     *buffer,
+                             const gchar       *mark_name,
+                             const GtkTextIter *where,
+                             gboolean           left_gravity)
 {
-  g_return_val_if_fail (GTK_IS_TEXT_BUFFER(buffer), NULL);
-  
+  g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), NULL);
+
   return gtk_text_buffer_set_mark (buffer, NULL, mark_name, where,
                                    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 (mark != NULL);
+  g_return_if_fail (GTK_IS_TEXT_MARK (mark));
   g_return_if_fail (!gtk_text_mark_get_deleted (mark));
-  g_return_if_fail (GTK_IS_TEXT_BUFFER(buffer));
-  
+  g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
+
   gtk_text_buffer_set_mark (buffer, mark, NULL, where, FALSE, TRUE);
 }
 
 /**
  * gtk_text_buffer_get_iter_at_mark:
  * @buffer: a #GtkTextBuffer
- * @iter: iterator to initialize
+ * @iter: (out): iterator to initialize
  * @mark: a #GtkTextMark in @buffer
- * 
+ *
  * Initializes @iter with the current position of @mark.
  **/
 void
 gtk_text_buffer_get_iter_at_mark (GtkTextBuffer *buffer,
-                                  GtkTextIter *iter,
-                                  GtkTextMark *mark)
+                                  GtkTextIter   *iter,
+                                  GtkTextMark   *mark)
 {
-  g_return_if_fail (mark != NULL);
+  g_return_if_fail (GTK_IS_TEXT_MARK (mark));
   g_return_if_fail (!gtk_text_mark_get_deleted (mark));
-  g_return_if_fail (GTK_IS_TEXT_BUFFER(buffer));
+  g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
 
-  gtk_text_btree_get_iter_at_mark (get_btree (buffer),
-                                   iter,
-                                   mark);
+  _gtk_text_btree_get_iter_at_mark (get_btree (buffer),
+                                    iter,
+                                    mark);
 }
 
 /**
  * gtk_text_buffer_delete_mark:
  * @buffer: a #GtkTextBuffer
- * @mark: a #GtkTextMark in @buffer 
- * 
+ * @mark: a #GtkTextMark in @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 gtk_text_mark_ref() the mark 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,
-                            GtkTextMark   *mark)
+gtk_text_buffer_delete_mark (GtkTextBuffer *buffer,
+                             GtkTextMark   *mark)
 {
-  g_return_if_fail (mark != NULL);
+  g_return_if_fail (GTK_IS_TEXT_MARK (mark));
   g_return_if_fail (!gtk_text_mark_get_deleted (mark));
   g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
-  
-  gtk_text_mark_ref (mark);
-  
-  gtk_text_btree_remove_mark (get_btree (buffer), mark);
+
+  g_object_ref (mark);
+
+  _gtk_text_btree_remove_mark (get_btree (buffer), mark);
 
   /* See rationale above for MARK_SET on why we emit this after
    * removing the mark, rather than removing the mark in a default
    * handler.
    */
-  gtk_signal_emit (GTK_OBJECT(buffer), signals[MARK_DELETED],
-                   mark);
+  g_signal_emit (buffer, signals[MARK_DELETED],
+                 0,
+                 mark);
 
-  gtk_text_mark_unref (mark);
+  g_object_unref (mark);
 }
 
 /**
  * gtk_text_buffer_get_mark:
  * @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;
 
-  g_return_val_if_fail (GTK_IS_TEXT_BUFFER(buffer), NULL);
+  g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), NULL);
   g_return_val_if_fail (name != NULL, NULL);
-  
-  mark = gtk_text_btree_get_mark_by_name (get_btree (buffer), name);
+
+  mark = _gtk_text_btree_get_mark_by_name (get_btree (buffer), name);
 
   return mark;
 }
 
-
 /**
  * gtk_text_buffer_move_mark_by_name:
- * @buffer: a #GtkTextBuffer 
+ * @buffer: a #GtkTextBuffer
  * @name: name of a mark
  * @where: new location for mark
- * 
+ *
  * Moves the mark named @name (which must exist) to location @where.
  * See gtk_text_buffer_move_mark() for details.
  **/
@@ -1289,17 +2291,17 @@ gtk_text_buffer_move_mark_by_name (GtkTextBuffer     *buffer,
 {
   GtkTextMark *mark;
 
-  g_return_if_fail (GTK_IS_TEXT_BUFFER(buffer));
+  g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
   g_return_if_fail (name != NULL);
-  
-  mark = gtk_text_btree_get_mark_by_name (get_btree (buffer), name);  
+
+  mark = _gtk_text_btree_get_mark_by_name (get_btree (buffer), name);
 
   if (mark == NULL)
     {
       g_warning ("%s: no mark named '%s'", G_STRLOC, name);
       return;
     }
-  
+
   gtk_text_buffer_move_mark (buffer, mark, where);
 }
 
@@ -1307,57 +2309,56 @@ gtk_text_buffer_move_mark_by_name (GtkTextBuffer     *buffer,
  * gtk_text_buffer_delete_mark_by_name:
  * @buffer: a #GtkTextBuffer
  * @name: name of a mark in @buffer
- * 
+ *
  * Deletes the mark named @name; the mark must exist. See
  * 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;
 
-  g_return_if_fail (GTK_IS_TEXT_BUFFER(buffer));
+  g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
   g_return_if_fail (name != NULL);
-  
-  mark = gtk_text_btree_get_mark_by_name (get_btree (buffer), name);  
+
+  mark = _gtk_text_btree_get_mark_by_name (get_btree (buffer), name);
 
   if (mark == NULL)
     {
       g_warning ("%s: no mark named '%s'", G_STRLOC, name);
       return;
     }
-  
+
   gtk_text_buffer_delete_mark (buffer, mark);
 }
 
 /**
  * gtk_text_buffer_get_insert:
  * @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
+ * 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);
+  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));
 }
 
 /**
  * gtk_text_buffer_get_selection_bound:
  * @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
@@ -1366,60 +2367,45 @@ gtk_text_buffer_get_insert (GtkTextBuffer *buffer)
  * 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");
-}
-
-
-GtkTextChildAnchor*
-gtk_text_buffer_create_child_anchor (GtkTextBuffer      *buffer,
-                                     const GtkTextIter  *where)
-{
-  /* FIXME: Implement? */
-
-  return NULL;
-}
-
-void
-gtk_text_buffer_move_child_anchor (GtkTextBuffer      *buffer,
-                                   GtkTextChildAnchor *anchor,
-                                   GtkTextIter        *where)
-{
-  
-  
-}
-
-void
-gtk_text_buffer_delete_child_anchor (GtkTextBuffer      *buffer,
-                                     GtkTextChildAnchor *anchor)
-{
-
-
+  g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), NULL);
 
+  return _gtk_text_btree_get_selection_bound (get_btree (buffer));
 }
 
+/**
+ * gtk_text_buffer_get_iter_at_child_anchor:
+ * @buffer: a #GtkTextBuffer
+ * @iter: (out): 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,
                                           GtkTextChildAnchor *anchor)
 {
+  g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
+  g_return_if_fail (iter != NULL);
+  g_return_if_fail (GTK_IS_TEXT_CHILD_ANCHOR (anchor));
+  g_return_if_fail (!gtk_text_child_anchor_get_deleted (anchor));
   
-
+  _gtk_text_btree_get_iter_at_child_anchor (get_btree (buffer),
+                                           iter,
+                                           anchor);
 }
 
 /**
  * gtk_text_buffer_place_cursor:
- * @buffer: a #GtkTextBuffer 
+ * @buffer: a #GtkTextBuffer
  * @where: where to put the cursor
- * 
+ *
  * 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
@@ -1432,22 +2418,43 @@ void
 gtk_text_buffer_place_cursor (GtkTextBuffer     *buffer,
                               const GtkTextIter *where)
 {
-  GtkTextIter real;
-  
-  g_return_if_fail(GTK_IS_TEXT_BUFFER(buffer));
+  gtk_text_buffer_select_range (buffer, where, where);
+}
 
-  real = *where;
-  
-  if (gtk_text_iter_is_last (&real))
-    gtk_text_iter_prev_char (&real);
-  
-  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_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;
+
+  g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
+
+  real_ins = *ins;
+  real_bound = *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));
 }
 
 /*
@@ -1457,152 +2464,395 @@ gtk_text_buffer_place_cursor (GtkTextBuffer     *buffer,
 /**
  * gtk_text_buffer_create_tag:
  * @buffer: a #GtkTextBuffer
- * @tag_name: name of the new tag, 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
+ * @...: %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().
+ * 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.
- * 
- * Return value: a new tag
- **/
+ *
+ * If @tag_name is non-%NULL, a tag called @tag_name must not already
+ * exist in the tag table for this buffer.
+ *
+ * The @first_property_name argument and subsequent arguments are a list
+ * of properties to set on the tag, as with g_object_set().
+ *
+ * Return value: (transfer none): a new tag
+ */
 GtkTextTag*
-gtk_text_buffer_create_tag(GtkTextBuffer *buffer,
-                           const gchar *tag_name)
+gtk_text_buffer_create_tag (GtkTextBuffer *buffer,
+                            const gchar   *tag_name,
+                            const gchar   *first_property_name,
+                            ...)
 {
   GtkTextTag *tag;
+  va_list list;
   
-  g_return_val_if_fail(GTK_IS_TEXT_BUFFER(buffer), NULL);
-  
-  tag = gtk_text_tag_new(tag_name);
+  g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), NULL);
+
+  tag = gtk_text_tag_new (tag_name);
 
-  gtk_text_tag_table_add(get_table (buffer), tag);
+  gtk_text_tag_table_add (get_table (buffer), tag);
+
+  if (first_property_name)
+    {
+      va_start (list, first_property_name);
+      g_object_set_valist (G_OBJECT (tag), first_property_name, list);
+      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)
 {
-  gtk_text_btree_tag (start, end, tag, TRUE);
+  if (tag->priv->table != buffer->priv->tag_table)
+    {
+      g_warning ("Can only apply tags that are in the tag table for the buffer");
+      return;
+    }
+  
+  _gtk_text_btree_tag (start, end, tag, TRUE);
 }
 
 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)
 {
-  gtk_text_btree_tag (start, end, tag, FALSE);
+  if (tag->priv->table != buffer->priv->tag_table)
+    {
+      g_warning ("Can only remove tags that are in the tag table for the buffer");
+      return;
+    }
+  
+  _gtk_text_btree_tag (start, end, tag, FALSE);
 }
 
+static void
+gtk_text_buffer_real_changed (GtkTextBuffer *buffer)
+{
+  gtk_text_buffer_set_modified (buffer, TRUE);
+}
 
 static void
-gtk_text_buffer_emit_tag(GtkTextBuffer *buffer,
-                         GtkTextTag *tag,
-                         gboolean apply,
-                         const GtkTextIter *start,
-                         const GtkTextIter *end)
+gtk_text_buffer_real_mark_set (GtkTextBuffer     *buffer,
+                               const GtkTextIter *iter,
+                               GtkTextMark       *mark)
 {
-  GtkTextIter start_tmp = *start;
-  GtkTextIter end_tmp = *end;
+  GtkTextMark *insert;
   
-  g_return_if_fail(tag != NULL);
-  
-  gtk_text_iter_reorder (&start_tmp, &end_tmp);
-  
-  if (apply)
-    gtk_signal_emit (GTK_OBJECT(buffer), signals[APPLY_TAG],
-                     tag, &start_tmp, &end_tmp);
-  else
-    gtk_signal_emit (GTK_OBJECT(buffer), signals[REMOVE_TAG],
-                     tag, &start_tmp, &end_tmp);
-}
+  insert = gtk_text_buffer_get_insert (buffer);
 
+  if (mark == insert || mark == gtk_text_buffer_get_selection_bound (buffer))
+    {
+      gboolean has_selection;
 
-void
-gtk_text_buffer_apply_tag(GtkTextBuffer *buffer,
-                          GtkTextTag    *tag,
+      update_selection_clipboards (buffer);
+    
+      has_selection = gtk_text_buffer_get_selection_bounds (buffer,
+                                                            NULL,
+                                                            NULL);
+
+      if (has_selection != buffer->priv->has_selection)
+        {
+          buffer->priv->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)
 {
-  g_return_if_fail(GTK_IS_TEXT_BUFFER(buffer));
-  g_return_if_fail(GTK_IS_TEXT_TAG (tag));
-  g_return_if_fail(start != NULL);
-  g_return_if_fail(end != NULL);  
+  GtkTextIter start_tmp = *start;
+  GtkTextIter end_tmp = *end;
+
+  g_return_if_fail (tag != NULL);
+
+  gtk_text_iter_order (&start_tmp, &end_tmp);
 
-  gtk_text_buffer_emit_tag(buffer, tag, TRUE, start, end);
+  if (apply)
+    g_signal_emit (buffer, signals[APPLY_TAG],
+                   0,
+                   tag, &start_tmp, &end_tmp);
+  else
+    g_signal_emit (buffer, signals[REMOVE_TAG],
+                   0,
+                   tag, &start_tmp, &end_tmp);
 }
 
+/**
+ * gtk_text_buffer_apply_tag:
+ * @buffer: a #GtkTextBuffer
+ * @tag: a #GtkTextTag
+ * @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
+ * handler for the signal applies @tag to the given range.
+ * @start and @end do not have to be in order.
+ **/
 void
-gtk_text_buffer_remove_tag(GtkTextBuffer *buffer,
-                           GtkTextTag    *tag,
+gtk_text_buffer_apply_tag (GtkTextBuffer     *buffer,
+                           GtkTextTag        *tag,
                            const GtkTextIter *start,
                            const GtkTextIter *end)
-
 {
-  g_return_if_fail(GTK_IS_TEXT_BUFFER(buffer));
-  g_return_if_fail(GTK_IS_TEXT_TAG (tag));
-  g_return_if_fail(start != NULL);
-  g_return_if_fail(end != NULL);
-
-  gtk_text_buffer_emit_tag(buffer, tag, FALSE, start, end);
+  g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
+  g_return_if_fail (GTK_IS_TEXT_TAG (tag));
+  g_return_if_fail (start != NULL);
+  g_return_if_fail (end != NULL);
+  g_return_if_fail (gtk_text_iter_get_buffer (start) == buffer);
+  g_return_if_fail (gtk_text_iter_get_buffer (end) == buffer);
+  g_return_if_fail (tag->priv->table == buffer->priv->tag_table);
+  
+  gtk_text_buffer_emit_tag (buffer, tag, TRUE, start, end);
 }
 
+/**
+ * gtk_text_buffer_remove_tag:
+ * @buffer: a #GtkTextBuffer
+ * @tag: a #GtkTextTag
+ * @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
+ * 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,
+                            const GtkTextIter *start,
+                            const GtkTextIter *end)
+
+{
+  g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
+  g_return_if_fail (GTK_IS_TEXT_TAG (tag));
+  g_return_if_fail (start != NULL);
+  g_return_if_fail (end != NULL);
+  g_return_if_fail (gtk_text_iter_get_buffer (start) == buffer);
+  g_return_if_fail (gtk_text_iter_get_buffer (end) == buffer);
+  g_return_if_fail (tag->priv->table == buffer->priv->tag_table);
+  
+  gtk_text_buffer_emit_tag (buffer, tag, FALSE, start, end);
+}
 
+/**
+ * gtk_text_buffer_apply_tag_by_name:
+ * @buffer: a #GtkTextBuffer
+ * @name: name of a named #GtkTextTag
+ * @start: one bound of range to be tagged
+ * @end: other bound of range to be tagged
+ *
+ * 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)
 {
   GtkTextTag *tag;
-  
-  g_return_if_fail(GTK_IS_TEXT_BUFFER(buffer));
-  g_return_if_fail(name != NULL);
-  g_return_if_fail(start != NULL);
-  g_return_if_fail(end != NULL);
-  
-  tag = gtk_text_tag_table_lookup(get_table (buffer),
-                                  name);
+
+  g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
+  g_return_if_fail (name != NULL);
+  g_return_if_fail (start != NULL);
+  g_return_if_fail (end != NULL);
+  g_return_if_fail (gtk_text_iter_get_buffer (start) == buffer);
+  g_return_if_fail (gtk_text_iter_get_buffer (end) == buffer);
+
+  tag = gtk_text_tag_table_lookup (get_table (buffer),
+                                   name);
 
   if (tag == NULL)
     {
-      g_warning("Unknown tag `%s'", name);
+      g_warning ("Unknown tag `%s'", name);
       return;
     }
 
-  gtk_text_buffer_emit_tag(buffer, tag, TRUE, start, end);
+  gtk_text_buffer_emit_tag (buffer, tag, TRUE, start, end);
 }
 
+/**
+ * gtk_text_buffer_remove_tag_by_name:
+ * @buffer: a #GtkTextBuffer
+ * @name: name of a #GtkTextTag
+ * @start: one bound of range to be untagged
+ * @end: other bound of range to be untagged
+ *
+ * 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)
 {
   GtkTextTag *tag;
-  
-  g_return_if_fail(GTK_IS_TEXT_BUFFER(buffer));
-  g_return_if_fail(name != NULL);
-  g_return_if_fail(start != NULL);
-  g_return_if_fail(end != NULL);
 
-  tag = gtk_text_tag_table_lookup(get_table (buffer),
-                                  name);
+  g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
+  g_return_if_fail (name != NULL);
+  g_return_if_fail (start != NULL);
+  g_return_if_fail (end != NULL);
+  g_return_if_fail (gtk_text_iter_get_buffer (start) == buffer);
+  g_return_if_fail (gtk_text_iter_get_buffer (end) == buffer);
+  
+  tag = gtk_text_tag_table_lookup (get_table (buffer),
+                                   name);
 
   if (tag == NULL)
     {
-      g_warning("Unknown tag `%s'", name);
+      g_warning ("Unknown tag `%s'", name);
       return;
     }
+
+  gtk_text_buffer_emit_tag (buffer, tag, FALSE, start, end);
+}
+
+static gint
+pointer_cmp (gconstpointer a,
+             gconstpointer b)
+{
+  if (a < b)
+    return -1;
+  else if (a > b)
+    return 1;
+  else
+    return 0;
+}
+
+/**
+ * gtk_text_buffer_remove_all_tags:
+ * @buffer: a #GtkTextBuffer
+ * @start: one bound of range to be untagged
+ * @end: other bound of range to be untagged
+ * 
+ * Removes all tags in the range between @start and @end.  Be careful
+ * with this function; it could remove tags added in code unrelated to
+ * the code you're currently writing. That is, using this function is
+ * probably a bad idea if you have two or more unrelated code sections
+ * that add tags.
+ **/
+void
+gtk_text_buffer_remove_all_tags (GtkTextBuffer     *buffer,
+                                 const GtkTextIter *start,
+                                 const GtkTextIter *end)
+{
+  GtkTextIter first, second, tmp;
+  GSList *tags;
+  GSList *tmp_list;
+  GSList *prev, *next;
+  GtkTextTag *tag;
+  
+  g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
+  g_return_if_fail (start != NULL);
+  g_return_if_fail (end != NULL);
+  g_return_if_fail (gtk_text_iter_get_buffer (start) == buffer);
+  g_return_if_fail (gtk_text_iter_get_buffer (end) == buffer);
+  
+  first = *start;
+  second = *end;
+
+  gtk_text_iter_order (&first, &second);
+
+  /* Get all tags turned on at the start */
+  tags = gtk_text_iter_get_tags (&first);
+  
+  /* Find any that are toggled on within the range */
+  tmp = first;
+  while (gtk_text_iter_forward_to_tag_toggle (&tmp, NULL))
+    {
+      GSList *toggled;
+      GSList *tmp_list2;
+
+      if (gtk_text_iter_compare (&tmp, &second) >= 0)
+        break; /* past the end of the range */
+      
+      toggled = gtk_text_iter_get_toggled_tags (&tmp, TRUE);
+
+      /* We could end up with a really big-ass list here.
+       * Fix it someday.
+       */
+      tmp_list2 = toggled;
+      while (tmp_list2 != NULL)
+        {
+          tags = g_slist_prepend (tags, tmp_list2->data);
+
+          tmp_list2 = g_slist_next (tmp_list2);
+        }
+
+      g_slist_free (toggled);
+    }
+  
+  /* Sort the list */
+  tags = g_slist_sort (tags, pointer_cmp);
+
+  /* Strip duplicates */
+  tag = NULL;
+  prev = NULL;
+  tmp_list = tags;
+  while (tmp_list != NULL)
+    {
+      if (tag == tmp_list->data)
+        {
+          /* duplicate */
+          next = tmp_list->next;
+          if (prev)
+            prev->next = next;
+
+          tmp_list->next = NULL;
+
+          g_slist_free (tmp_list);
+
+          tmp_list = next;
+          /* prev is unchanged */
+        }
+      else
+        {
+          /* not a duplicate */
+          tag = GTK_TEXT_TAG (tmp_list->data);
+          prev = tmp_list;
+          tmp_list = tmp_list->next;
+        }
+    }
+
+  g_slist_foreach (tags, (GFunc) g_object_ref, NULL);
+  
+  tmp_list = tags;
+  while (tmp_list != NULL)
+    {
+      tag = GTK_TEXT_TAG (tmp_list->data);
+
+      gtk_text_buffer_remove_tag (buffer, tag, &first, &second);
+      
+      tmp_list = tmp_list->next;
+    }
+
+  g_slist_foreach (tags, (GFunc) g_object_unref, NULL);
   
-  gtk_text_buffer_emit_tag(buffer, tag, FALSE, start, end);
+  g_slist_free (tags);
 }
 
 
@@ -1610,341 +2860,984 @@ gtk_text_buffer_remove_tag_by_name (GtkTextBuffer *buffer,
  * Obtain various iterators
  */
 
+/**
+ * gtk_text_buffer_get_iter_at_line_offset:
+ * @buffer: a #GtkTextBuffer
+ * @iter: (out): iterator to initialize
+ * @line_number: line number counting from 0
+ * @char_offset: char offset from start of line
+ *
+ * Obtains an iterator pointing to @char_offset within the given
+ * 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)
+{
+  g_return_if_fail (iter != NULL);
+  g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
+
+  _gtk_text_btree_get_iter_at_line_char (get_btree (buffer),
+                                         iter, line_number, char_offset);
+}
+
+/**
+ * gtk_text_buffer_get_iter_at_line_index:
+ * @buffer: a #GtkTextBuffer 
+ * @iter: (out): iterator to initialize 
+ * @line_number: line number counting from 0
+ * @byte_index: byte index from start of line
+ *
+ * Obtains an iterator pointing to @byte_index within the given line.
+ * @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_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));
+gtk_text_buffer_get_iter_at_line_index  (GtkTextBuffer *buffer,
+                                         GtkTextIter   *iter,
+                                         gint           line_number,
+                                         gint           byte_index)
+{
+  g_return_if_fail (iter != NULL);
+  g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
 
-  gtk_text_btree_get_iter_at_line_char(get_btree (buffer),
-                                       iter, line_number, char_offset);
+  _gtk_text_btree_get_iter_at_line_byte (get_btree (buffer),
+                                         iter, line_number, byte_index);
 }
 
+/**
+ * gtk_text_buffer_get_iter_at_line:
+ * @buffer: a #GtkTextBuffer 
+ * @iter: (out): iterator to initialize
+ * @line_number: line number counting from 0
+ * 
+ * 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));
+  g_return_if_fail (iter != NULL);
+  g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
 
   gtk_text_buffer_get_iter_at_line_offset (buffer, iter, line_number, 0);
 }
 
+/**
+ * gtk_text_buffer_get_iter_at_offset:
+ * @buffer: a #GtkTextBuffer 
+ * @iter: (out): iterator to initialize
+ * @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. 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)
+{
+  g_return_if_fail (iter != NULL);
+  g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
+
+  _gtk_text_btree_get_iter_at_char (get_btree (buffer), iter, char_offset);
+}
+
+/**
+ * gtk_text_buffer_get_start_iter:
+ * @buffer: a #GtkTextBuffer
+ * @iter: (out): iterator to initialize
+ *
+ * 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_iter_at_offset         (GtkTextBuffer      *buffer,
-                                            GtkTextIter        *iter,
-                                            gint                char_offset)
+gtk_text_buffer_get_start_iter (GtkTextBuffer *buffer,
+                                GtkTextIter   *iter)
 {
-  g_return_if_fail(iter != NULL);
-  g_return_if_fail(GTK_IS_TEXT_BUFFER(buffer));
+  g_return_if_fail (iter != NULL);
+  g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
 
-  gtk_text_btree_get_iter_at_char(get_btree (buffer), iter, char_offset);
+  _gtk_text_btree_get_iter_at_char (get_btree (buffer), iter, 0);
 }
 
+/**
+ * gtk_text_buffer_get_end_iter:
+ * @buffer: a #GtkTextBuffer 
+ * @iter: (out): iterator to initialize
+ *
+ * Initializes @iter with the "end iterator," one past the last valid
+ * character in the text buffer. If dereferenced with
+ * gtk_text_iter_get_char(), the end iterator has a character value of
+ * 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_last_iter         (GtkTextBuffer      *buffer,
-                                       GtkTextIter        *iter)
-{  
-  g_return_if_fail(iter != NULL);
-  g_return_if_fail(GTK_IS_TEXT_BUFFER(buffer));
+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));
 
-  gtk_text_btree_get_last_iter(get_btree (buffer), iter);
+  _gtk_text_btree_get_end_iter (get_btree (buffer), iter);
 }
 
+/**
+ * gtk_text_buffer_get_bounds:
+ * @buffer: a #GtkTextBuffer 
+ * @start: (out): iterator to initialize with first position in the buffer
+ * @end: (out): iterator to initialize with the end iterator
+ *
+ * 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,
                             GtkTextIter   *start,
                             GtkTextIter   *end)
 {
-  g_return_if_fail(start != NULL);
-  g_return_if_fail(end != NULL);
-  g_return_if_fail(GTK_IS_TEXT_BUFFER(buffer));
+  g_return_if_fail (start != NULL);
+  g_return_if_fail (end != NULL);
+  g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
 
-  gtk_text_btree_get_iter_at_char(get_btree (buffer), start, 0);
-  gtk_text_btree_get_last_iter(get_btree (buffer), end);
+  _gtk_text_btree_get_iter_at_char (get_btree (buffer), start, 0);
+  _gtk_text_btree_get_end_iter (get_btree (buffer), end);
 }
 
 /*
  * Modified flag
  */
 
+/**
+ * gtk_text_buffer_get_modified:
+ * @buffer: a #GtkTextBuffer 
+ * 
+ * Indicates whether the buffer has been modified since the last call
+ * to gtk_text_buffer_set_modified() set the modification flag to
+ * %FALSE. Used for example to enable a "save" function in a text
+ * editor.
+ * 
+ * Return value: %TRUE if the buffer has been modified
+ **/
 gboolean
-gtk_text_buffer_modified (GtkTextBuffer      *buffer)
+gtk_text_buffer_get_modified (GtkTextBuffer *buffer)
 {
-  g_return_val_if_fail(GTK_IS_TEXT_BUFFER(buffer), FALSE);
-  
-  return buffer->modified;
+  g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), FALSE);
+
+  return buffer->priv->modified;
 }
 
+/**
+ * gtk_text_buffer_set_modified:
+ * @buffer: a #GtkTextBuffer 
+ * @setting: modification flag setting
+ *
+ * Used to keep track of whether the buffer has been modified since the
+ * 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.
+ **/
 void
-gtk_text_buffer_set_modified (GtkTextBuffer      *buffer,
-                              gboolean             setting)
+gtk_text_buffer_set_modified (GtkTextBuffer *buffer,
+                              gboolean       setting)
 {
   gboolean fixed_setting;
-  
-  g_return_if_fail(GTK_IS_TEXT_BUFFER(buffer));
+
+  g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
 
   fixed_setting = setting != FALSE;
-  
-  if (buffer->modified == fixed_setting)
+
+  if (buffer->priv->modified == fixed_setting)
     return;
   else
     {
-      buffer->modified = fixed_setting;
-      gtk_signal_emit(GTK_OBJECT(buffer), signals[MODIFIED_CHANGED]);
+      buffer->priv->modified = fixed_setting;
+      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->priv->has_selection;
+}
+
 
 /*
  * Assorted other stuff
  */
 
+/**
+ * gtk_text_buffer_get_line_count:
+ * @buffer: a #GtkTextBuffer 
+ * 
+ * Obtains the number of lines in the buffer. This value is cached, so
+ * the function is very fast.
+ * 
+ * Return value: number of lines in the buffer
+ **/
 gint
-gtk_text_buffer_get_line_count(GtkTextBuffer *buffer)
-{
-  g_return_val_if_fail(GTK_IS_TEXT_BUFFER(buffer), 0);
-  
-  return gtk_text_btree_line_count(get_btree (buffer));
-}
-
-gint
-gtk_text_buffer_get_char_count(GtkTextBuffer *buffer)
+gtk_text_buffer_get_line_count (GtkTextBuffer *buffer)
 {
-  g_return_val_if_fail(GTK_IS_TEXT_BUFFER(buffer), 0);
+  g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), 0);
 
-  return gtk_text_btree_char_count(get_btree (buffer));
+  return _gtk_text_btree_line_count (get_btree (buffer));
 }
 
-GSList*
-gtk_text_buffer_get_tags               (GtkTextBuffer      *buffer,
-                                        const GtkTextIter  *iter)
+/**
+ * gtk_text_buffer_get_char_count:
+ * @buffer: a #GtkTextBuffer 
+ * 
+ * Gets the number of characters in the buffer; note that characters
+ * and bytes are not the same, you can't e.g. expect the contents of
+ * the buffer in string form to be this many bytes long. The character
+ * count is cached, so this function is very fast.
+ * 
+ * Return value: number of characters in the buffer
+ **/
+gint
+gtk_text_buffer_get_char_count (GtkTextBuffer *buffer)
 {
-  GSList *retval = NULL;
-  GtkTextTag** tags;
-  gint count = 0;
-  
-  tags = gtk_text_btree_get_tags(iter, &count);
-
-  if (count > 0)
-    {
-      gint i;
-
-      gtk_text_tag_array_sort(tags, count);
-      
-      i = 0;
-      while (i < count)
-        {
-          retval = g_slist_prepend(retval, tags[i]);
-          ++i;
-        }
+  g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), 0);
 
-      retval = g_slist_reverse(retval);
-    }
-
-  if (tags)
-    g_free(tags);
-
-  return retval;
+  return _gtk_text_btree_char_count (get_btree (buffer));
 }
 
 /* Called when we lose the primary selection.
  */
 static void
-clipboard_clear_cb (GtkClipboard *clipboard,
-                   gpointer      data)
+clipboard_clear_selection_cb (GtkClipboard *clipboard,
+                              gpointer      data)
 {
   /* Move selection_bound to the insertion point */
   GtkTextIter insert;
   GtkTextIter selection_bound;
   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_iter_at_mark(buffer, &selection_bound,
-                                  gtk_text_buffer_get_mark (buffer, "selection_bound"));
-  
-  if (!gtk_text_iter_equal(&insert, &selection_bound))
-    gtk_text_buffer_move_mark(buffer,
-                             gtk_text_buffer_get_mark (buffer, "selection_bound"),
-                             &insert);
+
+  gtk_text_buffer_get_iter_at_mark (buffer, &insert,
+                                    gtk_text_buffer_get_insert (buffer));
+  gtk_text_buffer_get_iter_at_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_selection_bound (buffer),
+                               &insert);
 }
 
 /* Called when we have the primary selection and someone else wants our
  * data in order to paste it.
  */
 static void
-clipboard_get_cb (GtkClipboard     *clipboard,
-                 GtkSelectionData *selection_data,
-                 guint             info,
-                 gpointer          data)
+clipboard_get_selection_cb (GtkClipboard     *clipboard,
+                            GtkSelectionData *selection_data,
+                            guint             info,
+                            gpointer          data)
 {
-  GtkTextBuffer *buffer = GTK_TEXT_BUFFER(data);
-  gchar *str;
+  GtkTextBuffer *buffer = GTK_TEXT_BUFFER (data);
   GtkTextIter start, end;
-  
-  if (gtk_text_buffer_get_selection_bounds(buffer, &start, &end))
+
+  if (gtk_text_buffer_get_selection_bounds (buffer, &start, &end))
     {
-      /* Extract the selected text */
-      str = gtk_text_iter_get_visible_text(&start, &end);
-      gtk_selection_data_set_text (selection_data, str);
-      g_free (str);
+      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,
+                                  gtk_selection_data_get_target (selection_data),
+                                  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,
+                                           gtk_selection_data_get_target (selection_data),
+                                           &start, &end, &len);
+
+          gtk_selection_data_set (selection_data,
+                                  gtk_selection_data_get_target (selection_data),
+                                  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, -1);
+          g_free (str);
+        }
     }
 }
 
-/* Called when we request a paste and receive the data
- */
-static void
-clipboard_received (GtkClipboard *clipboard,
-                   const gchar  *str,
-                   gpointer      data)
+static GtkTextBuffer *
+create_clipboard_contents_buffer (GtkTextBuffer *buffer)
 {
-  ClipboardRequest *request_data = data;
-  GtkTextBuffer *buffer = request_data->buffer;
+  GtkTextBuffer *contents;
 
-  if (str)
-    {
-      gboolean reselect;
-      GtkTextIter insert_point;
-      GtkTextMark *paste_point_override;
+  contents = gtk_text_buffer_new (gtk_text_buffer_get_tag_table (buffer));
 
-      paste_point_override = gtk_text_buffer_get_mark (buffer,
-                                                      "gtk_paste_point_override");
-      
-      if (paste_point_override != NULL)
-       {
-         gtk_text_buffer_get_iter_at_mark(buffer, &insert_point,
-                                          paste_point_override);
-         gtk_text_buffer_delete_mark(buffer,
-                                     gtk_text_buffer_get_mark (buffer,
-                                                               "gtk_paste_point_override"));
-       }
-      else
-       {
-         gtk_text_buffer_get_iter_at_mark(buffer, &insert_point,
-                                          gtk_text_buffer_get_mark (buffer,
-                                                                    "insert"));
-       }
-      
-      reselect = FALSE;
-
-      /* FIXME ALL OF THIS - I think that the "best method" is that when pasting
-       * with the cursor inside the selection area, you replace the selection
-       * with the new text, otherwise, you simply insert the new text at
-       * the point where the click occured, unselecting any selected text.
-       *
-       * This probably is best implemented as a "replace_selection" flag in
-       * ClipboardRequest.
-       */
-#if 0      
-      if ((TRUE/* Text is selected FIXME */) && 
-         (!buffer->have_selection || request_data->is_clipboard))
-       {
-         reselect = TRUE;
-         
-         if (buffer->have_selection)
-           {
-             /* FIXME Delete currently-selected chars but don't give up X
-                selection since we'll use the newly-pasted stuff as
-                a new X selection */
-             
-           }
-         else
-           ; /* FIXME Delete selected chars and give up X selection */
-       }
-#endif      
+  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));
 
-      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);
-      
-      if (reselect)
-       ; /* FIXME Select the region of text we just inserted */
-    }
+  /*  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);
 
-  g_object_unref (G_OBJECT (buffer));
-  g_free (request_data);
+  return contents;
 }
 
+/* Provide cut/copied data */
 static void
-gtk_text_buffer_update_primary_selection (GtkTextBuffer *buffer)
+clipboard_get_contents_cb (GtkClipboard     *clipboard,
+                           GtkSelectionData *selection_data,
+                           guint             info,
+                           gpointer          data)
 {
-  static const GtkTargetEntry targets[] = {
-    { "STRING", 0, TARGET_STRING },
-    { "TEXT",   0, TARGET_TEXT }, 
-    { "COMPOUND_TEXT", 0, TARGET_COMPOUND_TEXT },
-    { "UTF8_STRING", 0, TARGET_UTF8_STRING }
-  };
-
-  GtkTextIter start;
-  GtkTextIter end;
+  GtkTextBuffer *contents = GTK_TEXT_BUFFER (data);
 
-  GtkClipboard *clipboard = gtk_clipboard_get (GDK_SELECTION_PRIMARY);
+  g_assert (contents); /* This should never be called unless we own the clipboard */
 
-  /* Determine whether we have a selection and adjust X selection
-   * accordingly.
-   */
-  
-  if (!gtk_text_buffer_get_selection_bounds (buffer, &start, &end))
+  if (info == GTK_TEXT_BUFFER_TARGET_INFO_BUFFER_CONTENTS)
     {
-      if (gtk_clipboard_get_owner (clipboard) == G_OBJECT (buffer))
-       gtk_clipboard_clear (clipboard);
+      /* 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,
+                              gtk_selection_data_get_target (selection_data),
+                              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,
+                                       gtk_selection_data_get_target (selection_data),
+                                       &start, &end, &len);
+
+      gtk_selection_data_set (selection_data,
+                             gtk_selection_data_get_target (selection_data),
+                             8, /* bytes */
+                             str, len);
+      g_free (str);
     }
   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_cb, clipboard_clear_cb, G_OBJECT (buffer)))
-       clipboard_clear_cb (clipboard, buffer);
+      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);
     }
 }
 
 static void
-paste (GtkTextBuffer *buffer, 
-       gboolean is_clipboard,
-       gboolean interactive,
-       gboolean default_editable)
+clipboard_clear_contents_cb (GtkClipboard *clipboard,
+                             gpointer      data)
 {
-  ClipboardRequest *data = g_new (ClipboardRequest, 1);
+  GtkTextBuffer *contents = GTK_TEXT_BUFFER (data);
+
+  g_object_unref (contents);
+}
+
+static void
+get_paste_point (GtkTextBuffer *buffer,
+                 GtkTextIter   *iter,
+                 gboolean       clear_afterward)
+{
+  GtkTextIter insert_point;
+  GtkTextMark *paste_point_override;
 
-  data->buffer = buffer;
-  g_object_ref (G_OBJECT (buffer));
-  data->interactive = interactive;
-  data->default_editable = default_editable;
+  paste_point_override = gtk_text_buffer_get_mark (buffer,
+                                                   "gtk_paste_point_override");
 
-  gtk_clipboard_request_text (gtk_clipboard_get (is_clipboard ? GDK_NONE : GDK_SELECTION_PRIMARY),
-                             clipboard_received, data);
+  if (paste_point_override != NULL)
+    {
+      gtk_text_buffer_get_iter_at_mark (buffer, &insert_point,
+                                        paste_point_override);
+      if (clear_afterward)
+        gtk_text_buffer_delete_mark (buffer, paste_point_override);
+    }
+  else
+    {
+      gtk_text_buffer_get_iter_at_mark (buffer, &insert_point,
+                                        gtk_text_buffer_get_insert (buffer));
+    }
+
+  *iter = insert_point;
 }
 
-void
-gtk_text_buffer_paste_primary (GtkTextBuffer *buffer,
-                              GtkTextIter   *override_location,
-                              gboolean       default_editable)
+static void
+pre_paste_prep (ClipboardRequest *request_data,
+                GtkTextIter      *insert_point)
 {
-  if (override_location != NULL)
-    gtk_text_buffer_create_mark(buffer,
-                                "gtk_paste_point_override",
-                                override_location, FALSE);
+  GtkTextBuffer *buffer = request_data->buffer;
+  
+  get_paste_point (buffer, insert_point, TRUE);
+
+  /* If we're going to replace the selection, we insert before it to
+   * avoid messing it up, then we delete the selection after inserting.
+   */
+  if (request_data->replace_selection)
+    {
+      GtkTextIter start, end;
+      
+      if (gtk_text_buffer_get_selection_bounds (buffer, &start, &end))
+        *insert_point = start;
+    }
+}
+
+static void
+post_paste_cleanup (ClipboardRequest *request_data)
+{
+  if (request_data->replace_selection)
+    {
+      GtkTextIter start, end;
+      
+      if (gtk_text_buffer_get_selection_bounds (request_data->buffer,
+                                                &start, &end))
+        {
+          if (request_data->interactive)
+            gtk_text_buffer_delete_interactive (request_data->buffer,
+                                                &start,
+                                                &end,
+                                                request_data->default_editable);
+          else
+            gtk_text_buffer_delete (request_data->buffer, &start, &end);
+        }
+    }
+}
+
+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
+clipboard_text_received (GtkClipboard *clipboard,
+                         const gchar  *str,
+                         gpointer      data)
+{
+  ClipboardRequest *request_data = data;
+  GtkTextBuffer *buffer = request_data->buffer;
+
+  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);
+      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);
+    }
+  else
+    {
+      /* It may happen that we set a point override but we are not inserting
+         any text, so we must remove it afterwards */
+      GtkTextMark *paste_point_override;
+
+      paste_point_override = gtk_text_buffer_get_mark (buffer,
+                                                       "gtk_paste_point_override");
+
+      if (paste_point_override != NULL)
+        gtk_text_buffer_delete_mark (buffer, paste_point_override);
+    }
+
+  free_clipboard_request (request_data);
+}
+
+static GtkTextBuffer*
+selection_data_get_buffer (GtkSelectionData *selection_data,
+                           ClipboardRequest *request_data)
+{
+  GdkWindow *owner;
+  GtkTextBuffer *src_buffer = NULL;
+
+  /* If we can get the owner, the selection is in-process */
+  owner = gdk_selection_owner_get_for_display (gtk_selection_data_get_display (selection_data),
+                                              gtk_selection_data_get_selection (selection_data));
+
+  if (owner == NULL)
+    return NULL;
+  
+  if (gdk_window_get_window_type (owner) == GDK_WINDOW_FOREIGN)
+    return NULL;
+
+  if (gtk_selection_data_get_data_type (selection_data) != gdk_atom_intern_static_string ("GTK_TEXT_BUFFER_CONTENTS"))
+    return NULL;
+
+  if (gtk_selection_data_get_length (selection_data) != sizeof (src_buffer))
+    return NULL;
+
+  memcpy (&src_buffer, gtk_selection_data_get_data (selection_data), sizeof (src_buffer));
+
+  if (src_buffer == NULL)
+    return NULL;
+  
+  g_return_val_if_fail (GTK_IS_TEXT_BUFFER (src_buffer), NULL);
+
+  if (gtk_text_buffer_get_tag_table (src_buffer) !=
+      gtk_text_buffer_get_tag_table (request_data->buffer))
+    return NULL;
+  
+  return src_buffer;
+}
+
+#if 0
+/* These are pretty handy functions; maybe something like them
+ * should be in the public API. Also, there are other places in this
+ * file where they could be used.
+ */
+static gpointer
+save_iter (const GtkTextIter *iter,
+           gboolean           left_gravity)
+{
+  return gtk_text_buffer_create_mark (gtk_text_iter_get_buffer (iter),
+                                      NULL,
+                                      iter,
+                                      TRUE);
+}
+
+static void
+restore_iter (const GtkTextIter *iter,
+              gpointer           save_id)
+{
+  gtk_text_buffer_get_iter_at_mark (gtk_text_mark_get_buffer (save_id),
+                                    (GtkTextIter*) iter,
+                                    save_id);
+  gtk_text_buffer_delete_mark (gtk_text_mark_get_buffer (save_id),
+                               save_id);
+}
+#endif
+
+static void
+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 (src_buffer);
+  
+  pre_paste_prep (request_data, &insert_point);
   
-  paste (buffer, FALSE, TRUE, default_editable);
+  if (request_data->interactive) 
+    gtk_text_buffer_begin_user_action (buffer);
+
+  if (!gtk_text_iter_equal (start, end))
+    {
+      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);
+      
+  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
+clipboard_clipboard_buffer_received (GtkClipboard     *clipboard,
+                                     GtkSelectionData *selection_data,
+                                     gpointer          data)
+{
+  ClipboardRequest *request_data = data;
+  GtkTextBuffer *src_buffer;
+
+  src_buffer = selection_data_get_buffer (selection_data, request_data); 
+
+  if (src_buffer)
+    {
+      GtkTextIter 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
+    {
+      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
+update_selection_clipboards (GtkTextBuffer *buffer)
+{
+  GtkTextBufferPrivate *priv;
+  GSList               *tmp_list = buffer->priv->selection_clipboards;
+
+  priv = buffer->priv;
+
+  gtk_text_buffer_get_copy_target_list (buffer);
+
+  while (tmp_list)
+    {
+      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);
+       }
+
+      tmp_list = tmp_list->next;
+    }
+}
+
+static SelectionClipboard *
+find_selection_clipboard (GtkTextBuffer *buffer,
+                         GtkClipboard  *clipboard)
+{
+  GSList *tmp_list = buffer->priv->selection_clipboards;
+  while (tmp_list)
+    {
+      SelectionClipboard *selection_clipboard = tmp_list->data;
+      if (selection_clipboard->clipboard == clipboard)
+       return selection_clipboard;
+      
+      tmp_list = tmp_list->next;
+    }
+
+  return NULL;
+}
+
+/**
+ * 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)
+{
+  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);
+  if (selection_clipboard)
+    {
+      selection_clipboard->ref_count++;
+    }
+  else
+    {
+      selection_clipboard = g_new (SelectionClipboard, 1);
+
+      selection_clipboard->clipboard = clipboard;
+      selection_clipboard->ref_count = 1;
+
+      buffer->priv->selection_clipboards = g_slist_prepend (buffer->priv->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->priv->selection_clipboards = g_slist_remove (buffer->priv->selection_clipboards,
+                                                           selection_clipboard);
+      
+      g_free (selection_clipboard);
+    }
+}
+
+static void
+remove_all_selection_clipboards (GtkTextBuffer *buffer)
+{
+  GtkTextBufferPrivate *priv = buffer->priv;
+
+  g_slist_foreach (priv->selection_clipboards, (GFunc)g_free, NULL);
+  g_slist_free (priv->selection_clipboards);
+  priv->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,
-                                gboolean       default_editable)
+                                GtkClipboard  *clipboard,
+                                GtkTextIter   *override_location,
+                                 gboolean       default_editable)
 {
-  paste (buffer, TRUE, TRUE, default_editable);
+  ClipboardRequest *data = g_new (ClipboardRequest, 1);
+  GtkTextIter paste_point;
+  GtkTextIter start, end;
+
+  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
+   * replace the selection with the new text, otherwise, you
+   * simply insert the new text at the point where the click
+   * occured, unselecting any selected text. The replace_selection
+   * flag toggles this behavior.
+   */
+  data->replace_selection = FALSE;
+  
+  get_paste_point (buffer, &paste_point, FALSE);
+  if (gtk_text_buffer_get_selection_bounds (buffer, &start, &end) &&
+      (gtk_text_iter_in_range (&paste_point, &start, &end) ||
+       gtk_text_iter_equal (&paste_point, &end)))
+    data->replace_selection = TRUE;
+
+  gtk_clipboard_request_contents (clipboard,
+                                 gdk_atom_intern_static_string ("GTK_TEXT_BUFFER_CONTENTS"),
+                                 clipboard_clipboard_buffer_received, data);
 }
 
+/**
+ * gtk_text_buffer_delete_selection:
+ * @buffer: a #GtkTextBuffer 
+ * @interactive: whether the deletion is caused by user interaction
+ * @default_editable: whether the buffer is editable by default
+ *
+ * Deletes the range between the "insert" and "selection_bound" marks,
+ * that is, the currently-selected text. If @interactive is %TRUE,
+ * the editability of the selection will be considered (users can't delete
+ * uneditable text).
+ * 
+ * Return value: whether there was a non-empty selection to delete
+ **/
 gboolean
 gtk_text_buffer_delete_selection (GtkTextBuffer *buffer,
                                   gboolean interactive,
@@ -1952,8 +3845,8 @@ gtk_text_buffer_delete_selection (GtkTextBuffer *buffer,
 {
   GtkTextIter start;
   GtkTextIter end;
-  
-  if (!gtk_text_buffer_get_selection_bounds(buffer, &start, &end))
+
+  if (!gtk_text_buffer_get_selection_bounds (buffer, &start, &end))
     {
       return FALSE; /* No selection */
     }
@@ -1964,48 +3857,170 @@ gtk_text_buffer_delete_selection (GtkTextBuffer *buffer,
       else
         gtk_text_buffer_delete (buffer, &start, &end);
 
-      return TRUE; /* We deleted stuff */
+      return TRUE; /* We deleted stuff */
+    }
+}
+
+/**
+ * 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)
+cut_or_copy (GtkTextBuffer *buffer,
+            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 C-space
-     and M-w and other Emacs-style copy/yank keys). Note that insert
-     and selection_bound are guaranteed to exist, but the anchor only
-     exists sometimes. */
+   * insertion point. If that region is empty, then we cut the region
+   * between the "anchor" and the insertion point (this is for
+   * C-space and M-w and other Emacs-style copy/yank keys). Note that
+   * insert and selection_bound are guaranteed to exist, but the
+   * anchor only exists sometimes.
+   */
   GtkTextIter start;
   GtkTextIter end;
 
-  if (!gtk_text_buffer_get_selection_bounds(buffer, &start, &end))
+  priv = buffer->priv;
+
+  gtk_text_buffer_get_copy_target_list (buffer);
+
+  if (!gtk_text_buffer_get_selection_bounds (buffer, &start, &end))
     {
       /* Let's try the anchor thing */
       GtkTextMark * anchor = gtk_text_buffer_get_mark (buffer, "anchor");
-      
+
       if (anchor == NULL)
         return;
       else
         {
-          gtk_text_buffer_get_iter_at_mark(buffer, &end, anchor);
-          gtk_text_iter_reorder(&start, &end);
+          gtk_text_buffer_get_iter_at_mark (buffer, &end, anchor);
+          gtk_text_iter_order (&start, &end);
         }
     }
 
-  if (!gtk_text_iter_equal(&start, &end))
+  if (!gtk_text_iter_equal (&start, &end))
     {
-      GtkClipboard *clipboard = gtk_clipboard_get (GDK_NONE);
-      gchar *text;
-      
-      text = gtk_text_iter_get_visible_text (&start, &end);
-      gtk_clipboard_set_text (clipboard, text, -1);
-      g_free (text);
+      GtkTextIter ins;
+      GtkTextBuffer *contents;
+
+      contents = create_clipboard_contents_buffer (buffer);
+
+      gtk_text_buffer_get_iter_at_offset (contents, &ins, 0);
       
+      gtk_text_buffer_insert_range (contents, &ins, &start, &end);
+                                    
+      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)
         {
           if (interactive)
@@ -2017,57 +4032,718 @@ cut_or_copy(GtkTextBuffer *buffer,
     }
 }
 
+/**
+ * gtk_text_buffer_cut_clipboard:
+ * @buffer: a #GtkTextBuffer
+ * @clipboard: the #GtkClipboard object to cut to
+ * @default_editable: default editability of the buffer
+ *
+ * Copies the currently-selected text to a clipboard, then deletes
+ * said text if it's editable.
+ **/
 void
 gtk_text_buffer_cut_clipboard (GtkTextBuffer *buffer,
-                              gboolean       default_editable)
+                              GtkClipboard  *clipboard,
+                               gboolean       default_editable)
 {
-  cut_or_copy (buffer, TRUE, TRUE, default_editable);
+  gtk_text_buffer_begin_user_action (buffer);
+  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 a clipboard.
+ **/
 void
-gtk_text_buffer_copy_clipboard (GtkTextBuffer *buffer)
+gtk_text_buffer_copy_clipboard (GtkTextBuffer *buffer,
+                               GtkClipboard  *clipboard)
 {
-  cut_or_copy (buffer, FALSE, TRUE, TRUE);
+  cut_or_copy (buffer, clipboard, FALSE, TRUE, TRUE);
 }
 
-
 /**
  * gtk_text_buffer_get_selection_bounds:
- * @buffer: a #GtkTextBuffer
- * @start: iterator to initialize with selection start
- * @end: iterator to initialize with selection end
- * 
+ * @buffer: a #GtkTextBuffer a #GtkTextBuffer
+ * @start: (out): iterator to initialize with selection start
+ * @end: (out): iterator to initialize with selection end
+ *
  * Returns %TRUE if some text is selected; places the bounds
  * of the selection in @start and @end (if the selection has length 0,
  * then @start and @end are filled in with the same value).
  * @start and @end will be in ascending order. If @start and @end are
  * NULL, then they are not filled in, but the return value still indicates
  * whether text is selected.
- * 
+ *
  * 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);
 
-  return gtk_text_btree_get_selection_bounds (get_btree (buffer), start, end);
+  return _gtk_text_btree_get_selection_bounds (get_btree (buffer), start, end);
+}
+
+/**
+ * gtk_text_buffer_begin_user_action:
+ * @buffer: a #GtkTextBuffer
+ * 
+ * Called to indicate that the buffer operations between here and a
+ * call to gtk_text_buffer_end_user_action() are part of a single
+ * user-visible operation. The operations between
+ * gtk_text_buffer_begin_user_action() and
+ * 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.
+ *
+ * The "interactive" buffer mutation functions, such as
+ * gtk_text_buffer_insert_interactive(), automatically call begin/end
+ * user action around the buffer operations they perform, so there's
+ * no need to add extra calls if you user action consists solely of a
+ * single call to one of those functions.
+ **/
+void
+gtk_text_buffer_begin_user_action (GtkTextBuffer *buffer)
+{
+  g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
+
+  buffer->priv->user_action_count += 1;
+  
+  if (buffer->priv->user_action_count == 1)
+    {
+      /* Outermost nested user action begin emits the signal */
+      g_signal_emit (buffer, signals[BEGIN_USER_ACTION], 0);
+    }
+}
+
+/**
+ * gtk_text_buffer_end_user_action:
+ * @buffer: a #GtkTextBuffer
+ * 
+ * Should be paired with a call to gtk_text_buffer_begin_user_action().
+ * See that function for a full explanation.
+ **/
+void
+gtk_text_buffer_end_user_action (GtkTextBuffer *buffer)
+{
+  g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
+  g_return_if_fail (buffer->priv->user_action_count > 0);
+  
+  buffer->priv->user_action_count -= 1;
+  
+  if (buffer->priv->user_action_count == 0)
+    {
+      /* Ended the outermost-nested user action end, so emit the signal */
+      g_signal_emit (buffer, signals[END_USER_ACTION], 0);
+    }
+}
+
+static void
+gtk_text_buffer_free_target_lists (GtkTextBuffer *buffer)
+{
+  GtkTextBufferPrivate *priv = buffer->priv;
+
+  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: (transfer none): 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 = buffer->priv;
+
+  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: (transfer none): 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 = buffer->priv;
+
+  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
+ */
+
+#define ATTR_CACHE_SIZE 2
+
+typedef struct _CacheEntry CacheEntry;
+struct _CacheEntry
+{
+  gint line;
+  gint char_len;
+  PangoLogAttr *attrs;
+};
+
+struct _GtkTextLogAttrCache
+{
+  gint chars_changed_stamp;
+  CacheEntry entries[ATTR_CACHE_SIZE];
+};
+
+static void
+free_log_attr_cache (GtkTextLogAttrCache *cache)
+{
+  gint i = 0;
+  while (i < ATTR_CACHE_SIZE)
+    {
+      g_free (cache->entries[i].attrs);
+      ++i;
+    }
+  g_free (cache);
+}
+
+static void
+clear_log_attr_cache (GtkTextLogAttrCache *cache)
+{
+  gint i = 0;
+  while (i < ATTR_CACHE_SIZE)
+    {
+      g_free (cache->entries[i].attrs);
+      cache->entries[i].attrs = NULL;
+      ++i;
+    }
+}
+
+static PangoLogAttr*
+compute_log_attrs (const GtkTextIter *iter,
+                   gint              *char_lenp)
+{
+  GtkTextIter start;
+  GtkTextIter end;
+  gchar *paragraph;
+  gint char_len, byte_len;
+  PangoLogAttr *attrs = NULL;
+  
+  start = *iter;
+  end = *iter;
+
+  gtk_text_iter_set_line_offset (&start, 0);
+  gtk_text_iter_forward_line (&end);
+
+  paragraph = gtk_text_iter_get_slice (&start, &end);
+  char_len = g_utf8_strlen (paragraph, -1);
+  byte_len = strlen (paragraph);
+
+  g_assert (char_len > 0);
+
+  if (char_lenp)
+    *char_lenp = 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,
+                       char_len + 1);
+  
+  g_free (paragraph);
+
+  return attrs;
+}
+
+/* The return value from this is valid until you call this a second time.
+ */
+const PangoLogAttr*
+_gtk_text_buffer_get_line_log_attrs (GtkTextBuffer     *buffer,
+                                     const GtkTextIter *anywhere_in_line,
+                                     gint              *char_len)
+{
+  GtkTextBufferPrivate *priv;
+  gint line;
+  GtkTextLogAttrCache *cache;
+  gint i;
+  
+  g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), NULL);
+  g_return_val_if_fail (anywhere_in_line != NULL, NULL);
+
+  priv = buffer->priv;
+
+  /* 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
+   */
+  
+  if (priv->log_attr_cache == NULL)
+    {
+      priv->log_attr_cache = g_new0 (GtkTextLogAttrCache, 1);
+      priv->log_attr_cache->chars_changed_stamp =
+        _gtk_text_btree_get_chars_changed_stamp (get_btree (buffer));
+    }
+  else if (priv->log_attr_cache->chars_changed_stamp !=
+           _gtk_text_btree_get_chars_changed_stamp (get_btree (buffer)))
+    {
+      clear_log_attr_cache (priv->log_attr_cache);
+    }
+  
+  cache = priv->log_attr_cache;
+  line = gtk_text_iter_get_line (anywhere_in_line);
+
+  i = 0;
+  while (i < ATTR_CACHE_SIZE)
+    {
+      if (cache->entries[i].attrs &&
+          cache->entries[i].line == line)
+        {
+          if (char_len)
+            *char_len = cache->entries[i].char_len;
+          return cache->entries[i].attrs;
+        }
+      ++i;
+    }
+  
+  /* Not in cache; open up the first cache entry */
+  g_free (cache->entries[ATTR_CACHE_SIZE-1].attrs);
+  
+  g_memmove (cache->entries + 1, cache->entries,
+             sizeof (CacheEntry) * (ATTR_CACHE_SIZE - 1));
+
+  cache->entries[0].line = line;
+  cache->entries[0].attrs = compute_log_attrs (anywhere_in_line,
+                                               &cache->entries[0].char_len);
+
+  if (char_len)
+    *char_len = cache->entries[0].char_len;
+  
+  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->priv->btree)
+    _gtk_text_btree_notify_will_remove_tag (buffer->priv->btree, tag);
+}
 
 /*
  * Debug spew
  */
 
 void
-_gtk_text_buffer_spew(GtkTextBuffer *buffer)
+_gtk_text_buffer_spew (GtkTextBuffer *buffer)
+{
+  _gtk_text_btree_spew (get_btree (buffer));
+}
+
+void
+_gtk_text_buffer_get_text_before (GtkTextBuffer   *buffer,
+                                  AtkTextBoundary  boundary_type,
+                                  GtkTextIter     *position,
+                                  GtkTextIter     *start,
+                                  GtkTextIter     *end)
 {
-  gtk_text_btree_spew(get_btree (buffer));
+  gint line_number;
+
+  *start = *position;
+  *end = *start;
+
+  switch (boundary_type)
+    {
+    case ATK_TEXT_BOUNDARY_CHAR:
+      gtk_text_iter_backward_char (start);
+      break;
+
+    case ATK_TEXT_BOUNDARY_WORD_START:
+      if (!gtk_text_iter_starts_word (start))
+        gtk_text_iter_backward_word_start (start);
+      *end = *start;
+      gtk_text_iter_backward_word_start (start);
+      break;
+
+    case ATK_TEXT_BOUNDARY_WORD_END:
+      if (gtk_text_iter_inside_word (start) &&
+          !gtk_text_iter_starts_word (start))
+        gtk_text_iter_backward_word_start (start);
+      while (!gtk_text_iter_ends_word (start))
+        {
+          if (!gtk_text_iter_backward_char (start))
+            break;
+        }
+      *end = *start;
+      gtk_text_iter_backward_word_start (start);
+      while (!gtk_text_iter_ends_word (start))
+        {
+          if (!gtk_text_iter_backward_char (start))
+            break;
+        }
+      break;
+
+    case ATK_TEXT_BOUNDARY_SENTENCE_START:
+      if (!gtk_text_iter_starts_sentence (start))
+        gtk_text_iter_backward_sentence_start (start);
+      *end = *start;
+      gtk_text_iter_backward_sentence_start (start);
+      break;
+
+    case ATK_TEXT_BOUNDARY_SENTENCE_END:
+      if (gtk_text_iter_inside_sentence (start) &&
+          !gtk_text_iter_starts_sentence (start))
+        gtk_text_iter_backward_sentence_start (start);
+      while (!gtk_text_iter_ends_sentence (start))
+        {
+          if (!gtk_text_iter_backward_char (start))
+            break;
+        }
+      *end = *start;
+      gtk_text_iter_backward_sentence_start (start);
+      while (!gtk_text_iter_ends_sentence (start))
+        {
+          if (!gtk_text_iter_backward_char (start))
+            break;
+        }
+      break;
+
+    case ATK_TEXT_BOUNDARY_LINE_START:
+      line_number = gtk_text_iter_get_line (start);
+      if (line_number == 0)
+        {
+          gtk_text_buffer_get_iter_at_offset (buffer, start, 0);
+        }
+      else
+        {
+          gtk_text_iter_backward_line (start);
+          gtk_text_iter_forward_line (start);
+        }
+      *end = *start;
+      gtk_text_iter_backward_line (start);
+      break;
+
+    case ATK_TEXT_BOUNDARY_LINE_END:
+      line_number = gtk_text_iter_get_line (start);
+      if (line_number == 0)
+        {
+          gtk_text_buffer_get_iter_at_offset (buffer, start, 0);
+          *end = *start;
+        }
+      else
+        {
+          gtk_text_iter_backward_line (start);
+          *end = *start;
+          while (!gtk_text_iter_ends_line (start))
+            {
+              if (!gtk_text_iter_backward_char (start))
+                break;
+            }
+          gtk_text_iter_forward_to_line_end (end);
+        }
+      break;
+    }
 }
 
+void
+_gtk_text_buffer_get_text_at (GtkTextBuffer   *buffer,
+                              AtkTextBoundary  boundary_type,
+                              GtkTextIter     *position,
+                              GtkTextIter     *start,
+                              GtkTextIter     *end)
+{
+  gint line_number;
+
+  *start = *position;
+  *end = *start;
+
+  switch (boundary_type)
+    {
+    case ATK_TEXT_BOUNDARY_CHAR:
+      gtk_text_iter_forward_char (end);
+      break;
+
+    case ATK_TEXT_BOUNDARY_WORD_START:
+      if (!gtk_text_iter_starts_word (start))
+        gtk_text_iter_backward_word_start (start);
+      if (gtk_text_iter_inside_word (end))
+        gtk_text_iter_forward_word_end (end);
+      while (!gtk_text_iter_starts_word (end))
+        {
+          if (!gtk_text_iter_forward_char (end))
+            break;
+        }
+      break;
+
+    case ATK_TEXT_BOUNDARY_WORD_END:
+      if (gtk_text_iter_inside_word (start) &&
+          !gtk_text_iter_starts_word (start))
+        gtk_text_iter_backward_word_start (start);
+      while (!gtk_text_iter_ends_word (start))
+        {
+          if (!gtk_text_iter_backward_char (start))
+            break;
+        }
+      gtk_text_iter_forward_word_end (end);
+      break;
+
+    case ATK_TEXT_BOUNDARY_SENTENCE_START:
+      if (!gtk_text_iter_starts_sentence (start))
+        gtk_text_iter_backward_sentence_start (start);
+      if (gtk_text_iter_inside_sentence (end))
+        gtk_text_iter_forward_sentence_end (end);
+      while (!gtk_text_iter_starts_sentence (end))
+        {
+          if (!gtk_text_iter_forward_char (end))
+            break;
+        }
+      break;
+
+    case ATK_TEXT_BOUNDARY_SENTENCE_END:
+      if (gtk_text_iter_inside_sentence (start) &&
+          !gtk_text_iter_starts_sentence (start))
+        gtk_text_iter_backward_sentence_start (start);
+      while (!gtk_text_iter_ends_sentence (start))
+        {
+          if (!gtk_text_iter_backward_char (start))
+            break;
+        }
+      gtk_text_iter_forward_sentence_end (end);
+      break;
 
+    case ATK_TEXT_BOUNDARY_LINE_START:
+      line_number = gtk_text_iter_get_line (start);
+      if (line_number == 0)
+        {
+          gtk_text_buffer_get_iter_at_offset (buffer, start, 0);
+        }
+      else
+        {
+          gtk_text_iter_backward_line (start);
+          gtk_text_iter_forward_line (start);
+        }
+      gtk_text_iter_forward_line (end);
+      break;
 
+    case ATK_TEXT_BOUNDARY_LINE_END:
+      line_number = gtk_text_iter_get_line (start);
+      if (line_number == 0)
+        {
+          gtk_text_buffer_get_iter_at_offset (buffer, start, 0);
+        }
+      else
+        {
+          gtk_text_iter_backward_line (start);
+          gtk_text_iter_forward_line (start);
+        }
+      while (!gtk_text_iter_ends_line (start))
+        {
+          if (!gtk_text_iter_backward_char (start))
+            break;
+        }
+      gtk_text_iter_forward_to_line_end (end);
+      break;
+   }
+}
 
+void
+_gtk_text_buffer_get_text_after (GtkTextBuffer   *buffer,
+                                 AtkTextBoundary  boundary_type,
+                                 GtkTextIter     *position,
+                                 GtkTextIter     *start,
+                                 GtkTextIter     *end)
+{
+  *start = *position;
+  *end = *start;
 
+  switch (boundary_type)
+    {
+    case ATK_TEXT_BOUNDARY_CHAR:
+      gtk_text_iter_forward_char (start);
+      gtk_text_iter_forward_chars (end, 2);
+      break;
+
+    case ATK_TEXT_BOUNDARY_WORD_START:
+      if (gtk_text_iter_inside_word (end))
+        gtk_text_iter_forward_word_end (end);
+      while (!gtk_text_iter_starts_word (end))
+        {
+          if (!gtk_text_iter_forward_char (end))
+            break;
+        }
+      *start = *end;
+      if (!gtk_text_iter_is_end (end))
+        {
+          gtk_text_iter_forward_word_end (end);
+          while (!gtk_text_iter_starts_word (end))
+            {
+              if (!gtk_text_iter_forward_char (end))
+                break;
+            }
+        }
+      break;
+
+    case ATK_TEXT_BOUNDARY_WORD_END:
+      gtk_text_iter_forward_word_end (end);
+      *start = *end;
+      if (!gtk_text_iter_is_end (end))
+        gtk_text_iter_forward_word_end (end);
+      break;
+
+    case ATK_TEXT_BOUNDARY_SENTENCE_START:
+      if (gtk_text_iter_inside_sentence (end))
+        gtk_text_iter_forward_sentence_end (end);
+      while (!gtk_text_iter_starts_sentence (end))
+        {
+          if (!gtk_text_iter_forward_char (end))
+            break;
+        }
+      *start = *end;
+      if (!gtk_text_iter_is_end (end))
+        {
+          gtk_text_iter_forward_sentence_end (end);
+          while (!gtk_text_iter_starts_sentence (end))
+            {
+              if (!gtk_text_iter_forward_char (end))
+                break;
+            }
+        }
+      break;
+
+    case ATK_TEXT_BOUNDARY_SENTENCE_END:
+      gtk_text_iter_forward_sentence_end (end);
+      *start = *end;
+      if (!gtk_text_iter_is_end (end))
+        gtk_text_iter_forward_sentence_end (end);
+      break;
+
+    case ATK_TEXT_BOUNDARY_LINE_START:
+      gtk_text_iter_forward_line (end);
+      *start = *end;
+      gtk_text_iter_forward_line (end);
+      break;
+
+    case ATK_TEXT_BOUNDARY_LINE_END:
+      gtk_text_iter_forward_line (start);
+      *end = *start;
+      if (!gtk_text_iter_is_end (start))
+        {
+          while (!gtk_text_iter_ends_line (start))
+            {
+              if (!gtk_text_iter_backward_char (start))
+                break;
+            }
+          gtk_text_iter_forward_to_line_end (end);
+        }
+      break;
+    }
+}