[gnome-builder/wip/vim] vim: fix `yw' and other y movements.

[Christian Hergert <chergert src gnome org>]

commit 122c57f6ef91382b800d57392c6237e63f8a3de7
Author: Christian Hergert <christian hergert me>
Date:   Wed Oct 1 23:53:16 2014 -0700

    vim: fix `yw' and other y movements.
    
    They weren't selecting, nor were preserving location of cursor.

 src/editor/gb-editor-vim.c |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)
---
diff --git a/src/editor/gb-editor-vim.c b/src/editor/gb-editor-vim.c
index 617bb86..f402854 100644
--- a/src/editor/gb-editor-vim.c
+++ b/src/editor/gb-editor-vim.c
@@ -259,6 +259,11 @@ gb_editor_vim_set_mode (GbEditorVim     *vim,
     gb_source_view_clear_snippets (GB_SOURCE_VIEW (vim->priv->text_view));
 
   /*
+   * Clear the current selection too.
+   */
+  gb_editor_vim_clear_selection (vim);
+
+  /*
    * Make the command entry visible if necessary.
    */
   g_signal_emit (vim, gSignals [COMMAND_VISIBILITY_TOGGLED], 0,
@@ -2723,15 +2728,10 @@ gb_editor_vim_cmd_yank (GbEditorVim *vim,
   g_assert (GB_IS_EDITOR_VIM (vim));
 
   gb_editor_vim_clear_selection (vim);
+  gb_editor_vim_save_position (vim);
 
   if (modifier == 'y')
-    {
-      gb_editor_vim_save_position (vim);
       gb_editor_vim_select_line (vim);
-      gb_editor_vim_yank (vim);
-      gb_editor_vim_clear_selection (vim);
-      gb_editor_vim_restore_position (vim);
-    }
   else
     {
       GbEditorVimCommand *cmd;
@@ -2740,11 +2740,13 @@ gb_editor_vim_cmd_yank (GbEditorVim *vim,
       if (!cmd || (cmd->type != GB_EDITOR_VIM_COMMAND_MOVEMENT))
         return;
 
+      gb_editor_vim_select_char (vim);
       cmd->func (vim, 1, '\0');
-
-      gb_editor_vim_yank (vim);
-      gb_editor_vim_clear_selection (vim);
     }
+
+  gb_editor_vim_yank (vim);
+  gb_editor_vim_clear_selection (vim);
+  gb_editor_vim_restore_position (vim);
 }
 
 static void