From 2dc224d7bde4a533f297c96b4a29ab4d58e011c4 Mon Sep 17 00:00:00 2001 From: mcclurgm Date: Wed, 25 Mar 2020 12:29:24 -0600 Subject: [PATCH 1/2] Change DISPLAY_LINE MovementSteps to PARAGRAPH --- plugins/vim-emulation/vim-emulation.vala | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/vim-emulation/vim-emulation.vala b/plugins/vim-emulation/vim-emulation.vala index 92b9b2c851..606cea78d4 100644 --- a/plugins/vim-emulation/vim-emulation.vala +++ b/plugins/vim-emulation/vim-emulation.vala @@ -141,12 +141,12 @@ public class Scratch.Plugins.VimEmulation : Peas.ExtensionBase, Peas.Activatable case Gdk.Key.Down: case Gdk.Key.j: case Gdk.Key.plus: - view.move_cursor (Gtk.MovementStep.DISPLAY_LINES, 1, false); + view.move_cursor (Gtk.MovementStep.PARAGRAPHS, 1, false); break; case Gdk.Key.Up: case Gdk.Key.k: case Gdk.Key.minus: - view.move_cursor (Gtk.MovementStep.DISPLAY_LINES, -1, false); + view.move_cursor (Gtk.MovementStep.PARAGRAPHS, -1, false); break; case Gdk.Key.Right: case Gdk.Key.l: @@ -154,7 +154,7 @@ public class Scratch.Plugins.VimEmulation : Peas.ExtensionBase, Peas.Activatable break; case Gdk.Key.End: case Gdk.Key.dollar: - view.move_cursor (Gtk.MovementStep.DISPLAY_LINE_ENDS, 1, false); + view.move_cursor (Gtk.MovementStep.PARAGRAPH_ENDS, 1, false); break; case Gdk.Key.u: view.undo (); @@ -191,7 +191,7 @@ public class Scratch.Plugins.VimEmulation : Peas.ExtensionBase, Peas.Activatable } mode = Mode.INSERT; - view.move_cursor (Gtk.MovementStep.DISPLAY_LINE_ENDS, 1, false); + view.move_cursor (Gtk.MovementStep.PARAGRAPH_ENDS, 1, false); debug ("Vim Emulation: INSERT Mode!"); break; case 46: // Dot "." @@ -201,7 +201,7 @@ public class Scratch.Plugins.VimEmulation : Peas.ExtensionBase, Peas.Activatable case Gdk.Key.Home: case Gdk.Key.@0: if (number == "") { - view.move_cursor (Gtk.MovementStep.DISPLAY_LINES, 1, false); + view.move_cursor (Gtk.MovementStep.PARAGRAPHS, 1, false); } else { number += "0"; } From c7b32da007ad188ff4710e65d4abf27664d8adb1 Mon Sep 17 00:00:00 2001 From: Michael McClurg Date: Wed, 21 Apr 2021 10:40:08 -0600 Subject: [PATCH 2/2] Revert j, k commands --- plugins/vim-emulation/vim-emulation.vala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/vim-emulation/vim-emulation.vala b/plugins/vim-emulation/vim-emulation.vala index 0850bcccc5..32ec3c397a 100644 --- a/plugins/vim-emulation/vim-emulation.vala +++ b/plugins/vim-emulation/vim-emulation.vala @@ -141,12 +141,12 @@ public class Scratch.Plugins.VimEmulation : Peas.ExtensionBase, Peas.Activatable case Gdk.Key.Down: case Gdk.Key.j: case Gdk.Key.plus: - view.move_cursor (Gtk.MovementStep.PARAGRAPHS, 1, false); + view.move_cursor (Gtk.MovementStep.DISPLAY_LINES, 1, false); break; case Gdk.Key.Up: case Gdk.Key.k: case Gdk.Key.minus: - view.move_cursor (Gtk.MovementStep.PARAGRAPHS, -1, false); + view.move_cursor (Gtk.MovementStep.DISPLAY_LINES, -1, false); break; case Gdk.Key.Right: case Gdk.Key.l: