[gnome-builder] vim: fix +,Return,Enter to end up on first non-blank

[Sébastien Lafargue <slafargue src gnome org>]

commit b5eb232200777cd2b9c0c7dce4d4a81f07f96023
Author: Sebastien Lafargue <slafargue gnome org>
Date:   Sun Nov 15 15:10:41 2015 +0100

    vim: fix +,Return,Enter to end up on first non-blank
    
    We do not add <ctrl>M because we are going to use it
    for code comment/uncomment

 data/keybindings/vim.css |   22 +++++++++++++---------
 1 files changed, 13 insertions(+), 9 deletions(-)
---
diff --git a/data/keybindings/vim.css b/data/keybindings/vim.css
index dfa344c..7e3f5d5 100644
--- a/data/keybindings/vim.css
+++ b/data/keybindings/vim.css
@@ -220,9 +220,22 @@
   bind "minus" { "movement" (previous-line, 0, 1, 1)
                  "movement" (first-nonspace-char, 0, 1, 0)
                  "clear-count" () };
+
   bind "plus" { "movement" (next-line, 0, 1, 1)
                  "movement" (first-nonspace-char, 0, 1, 0)
                  "clear-count" () };
+  bind "KP_Enter" { "movement" (next-line, 0, 1, 1)
+                    "movement" (first-nonspace-char, 0, 1, 0)
+                    "clear-count" () };
+  bind "<shift>KP_Enter" { "movement" (next-line, 0, 1, 1)
+                           "movement" (first-nonspace-char, 0, 1, 0)
+                           "clear-count" () };
+  bind "Return" { "movement" (next-line, 0, 1, 1)
+                  "movement" (first-nonspace-char, 0, 1, 0)
+                  "clear-count" () };
+  bind "<shift>Return" { "movement" (next-line, 0, 1, 0)
+                         "movement" (first-nonspace-char, 0, 1, 0)
+                         "clear-count" () };
 
   bind "<shift>k" { "clear-selection" ()
                     "save-insert-mark" ()
@@ -500,15 +513,6 @@
   bind "space" { "movement" (next-offset, 0, 1, 1)
                  "clear-count" () };
 
-  bind "KP_Enter" { "movement" (next-line, 0, 1, 1)
-                    "clear-count" () };
-  bind "<shift>KP_Enter" { "movement" (next-line, 0, 1, 1)
-                           "clear-count" () };
-  bind "Return" { "movement" (next-line, 0, 1, 1)
-                  "clear-count" () };
-  bind "<shift>Return" { "movement" (next-line, 0, 1, 0)
-                         "clear-count" () };
-
   /* copy */
   bind "y" { "set-mode" ("vim-normal-y", transient) };
   bind "<shift>y" { "save-insert-mark" ()