[gnome-builder/gnome-builder-3-18] vim: follow up to fix previous patches

[Christian Hergert <chergert src gnome org>]

commit 824d9c8d9e76ed048029906672945352a8766d7d
Author: Sebastien Lafargue <slafargue gnome org>
Date:   Wed Oct 14 19:10:41 2015 +0200

    vim: follow up to fix previous patches
    
    this is what you get when doing patches before coffee time

 data/keybindings/vim.css           |   14 +++++++-------
 libide/ide-source-view-movements.c |    2 +-
 libide/ide-source-view.c           |   13 -------------
 3 files changed, 8 insertions(+), 21 deletions(-)
---
diff --git a/data/keybindings/vim.css b/data/keybindings/vim.css
index 7ba5745..6d9f267 100644
--- a/data/keybindings/vim.css
+++ b/data/keybindings/vim.css
@@ -298,7 +298,7 @@
   bind "<shift>t" { "save-command" ()
                     "capture-modifier" ()
                     "save-search-char" ()
-                    "movement" (previous-match-modifier, 0, 1, 1)
+                    "movement" (previous-match-modifier, 0, 0, 1)
                     "clear-modifier" () };
   bind "comma" { "movement" (previous-match-search-char, 0, 0, 1)
                  "clear-count" () };
@@ -595,7 +595,7 @@
                     "capture-modifier" ()
                     "save-search-char" ()
                     "set-mode" ("vim-insert", permanent)
-                    "movement" (previous-match-modifier, 1, 0, 1)
+                    "movement" (previous-match-modifier, 1, 1, 1)
                     "copy-clipboard" ()
                     "selection-theatric" (shrink)
                     "delete-selection" ()
@@ -606,7 +606,7 @@
                     "capture-modifier" ()
                     "save-search-char" ()
                     "set-mode" ("vim-insert", permanent)
-                    "movement" (previous-match-modifier, 1, 1, 1)
+                    "movement" (previous-match-modifier, 1, 0, 1)
                     "copy-clipboard" ()
                     "selection-theatric" (shrink)
                     "delete-selection" ()
@@ -758,7 +758,7 @@
                     "save-command" ()
                     "capture-modifier" ()
                     "save-search-char" ()
-                    "movement" (previous-match-modifier, 1, 0, 1)
+                    "movement" (previous-match-modifier, 1, 1, 1)
                     "copy-clipboard" ()
                     "selection-theatric" (shrink)
                     "delete-selection" ()
@@ -768,7 +768,7 @@
                     "save-command" ()
                     "capture-modifier" ()
                     "save-search-char" ()
-                    "movement" (previous-match-modifier, 1, 1, 1)
+                    "movement" (previous-match-modifier, 1, 0, 1)
                     "copy-clipboard" ()
                     "selection-theatric" (shrink)
                     "delete-selection" ()
@@ -1321,12 +1321,12 @@
   bind "<shift>f" { "save-command" ()
                     "capture-modifier" ()
                     "save-search-char" ()
-                    "movement" (previous-match-modifier, 1, 0, 1)
+                    "movement" (previous-match-modifier, 1, 1, 1)
                     "clear-modifier" () };
   bind "<shift>t" { "save-command" ()
                     "capture-modifier" ()
                     "save-search-char" ()
-                    "movement" (previous-match-modifier, 1, 1, 1)
+                    "movement" (previous-match-modifier, 1, 0, 1)
                     "clear-modifier" () };
   bind "comma" { "movement" (previous-match-search-char, 1, 0, 1)
                  "clear-count" () };
diff --git a/libide/ide-source-view-movements.c b/libide/ide-source-view-movements.c
index f0e60ca..e8bc332 100644
--- a/libide/ide-source-view-movements.c
+++ b/libide/ide-source-view-movements.c
@@ -1266,7 +1266,7 @@ ide_source_view_movement_match_search_char (Movement *mv, gboolean is_next_direc
   is_forward = (mv->command == 'f' || mv->command == 't');
   is_till = (mv->command == 't' || mv->command == 'T');
 
-  mode_name = _ide_source_view_get_mode_name (mv->self);
+  mode_name = ide_source_view_get_mode_name (mv->self);
   is_inclusive_mode = (g_str_has_prefix (mode_name, "vim-visual") ||
                        g_str_has_prefix (mode_name, "vim-normal-c") ||
                        g_str_has_prefix (mode_name, "vim-normal-d"));
diff --git a/libide/ide-source-view.c b/libide/ide-source-view.c
index ede08fc..8638482 100644
--- a/libide/ide-source-view.c
+++ b/libide/ide-source-view.c
@@ -6581,19 +6581,6 @@ ide_source_view_get_mode_display_name (IdeSourceView *self)
   return priv->display_name;
 }
 
-const gchar *
-_ide_source_view_get_mode_name (IdeSourceView *self)
-{
-  IdeSourceViewPrivate *priv = ide_source_view_get_instance_private (self);
-
-  g_return_val_if_fail (IDE_IS_SOURCE_VIEW (self), NULL);
-
-  if (priv->mode != NULL)
-    return ide_source_view_mode_get_name (priv->mode);
-
-  return NULL;
-}
-
 gboolean
 ide_source_view_get_overwrite_braces (IdeSourceView *self)
 {