[gnome-builder] vim: fix trailing whitespace inserted with `o'

[Christian Hergert <chergert src gnome org>]

commit a425a8e9b6a5cf391b34c63601541a48e17f93db
Author: Christian Hergert <chergert redhat com>
Date:   Thu Oct 15 14:21:01 2015 -0700

    vim: fix trailing whitespace inserted with `o'
    
    We were improperly inserting whitespace where we shouldn't have when `o'
    was used. This was not usually noticed since we'd clean it up on save.
    
    Since we have "reindnt" now, all of this is easier to implement, so we
    can remove some of our hacks.

 data/keybindings/vim.css |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/data/keybindings/vim.css b/data/keybindings/vim.css
index 92c50b7..484d14a 100644
--- a/data/keybindings/vim.css
+++ b/data/keybindings/vim.css
@@ -199,7 +199,8 @@
   bind "o" { "begin-macro" ()
              "set-mode" ("vim-insert", permanent)
              "movement" (line-end, 0, 1, 0)
-             "insert-at-cursor-and-indent" ("\n") };
+            "insert-at-cursor" ("\n")
+            "reindent" () };
 
   /* insert line before current */
   bind "<shift>o" { "begin-macro" ()
@@ -207,7 +208,7 @@
                     "movement" (first-char, 0, 0, 0)
                     "insert-at-cursor" ("\n")
                     "move-cursor" (display-lines, -1, 0)
-                    "auto-indent" () };
+                    "reindent" () };
 
   bind "minus" { "movement" (previous-line, 0, 1, 1)
                  "movement" (first-nonspace-char, 0, 1, 0)