[gnome-builder] vim: keep insert mark on current character upon select_char().

[Christian Hergert <chergert src gnome org>]

commit df96e69707d824394e79f51b7c1b6632050619f7
Author: Christian Hergert <christian hergert me>
Date:   Mon Oct 6 01:39:50 2014 -0700

    vim: keep insert mark on current character upon select_char().

 src/editor/gb-editor-vim.c |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/src/editor/gb-editor-vim.c b/src/editor/gb-editor-vim.c
index ff7f85c..c1a1f04 100644
--- a/src/editor/gb-editor-vim.c
+++ b/src/editor/gb-editor-vim.c
@@ -1369,26 +1369,26 @@ gb_editor_vim_select_char (GbEditorVim *vim)
 {
   GtkTextBuffer *buffer;
   GtkTextMark *insert;
-  GtkTextIter begin;
-  GtkTextIter end;
+  GtkTextIter iter;
+  GtkTextIter selection;
+  GtkTextIter *target;
+  gboolean has_selection;
 
   g_assert (GB_IS_EDITOR_VIM (vim));
 
   buffer = gtk_text_view_get_buffer (vim->priv->text_view);
-  insert = gtk_text_buffer_get_insert (buffer);
-
-  gtk_text_buffer_get_iter_at_mark (buffer, &begin, insert);
-  gtk_text_iter_assign (&end, &begin);
-
-  if (!gtk_text_iter_forward_char (&end))
-    gtk_text_buffer_get_end_iter (buffer, &end);
+  has_selection = gb_editor_vim_get_selection_bounds (vim, &iter, &selection);
+  target = has_selection ? &iter : &selection;
 
-  gb_editor_vim_select_range (vim, &begin, &end);
+  if (!gtk_text_iter_forward_char (target))
+    gtk_text_buffer_get_end_iter (buffer, target);
 
-  gb_editor_vim_set_selection_anchor (vim, &begin, &end);
+  gb_editor_vim_select_range (vim, &iter, &selection);
+  gb_editor_vim_set_selection_anchor (vim, &iter, &selection);
 
   vim->priv->target_line_offset = gb_editor_vim_get_line_offset (vim);
 
+  insert = gtk_text_buffer_get_insert (buffer);
   gtk_text_view_scroll_mark_onscreen (vim->priv->text_view, insert);
 }