vis

commit 5680eb807bfc8267af25deb972a676d347ae9664
parent 4b940e51a25b8926c612dd3a5a82fe79918f3910
Author: Marc André Tanner <mat@brain-dump.org>
Date:   Tue, 13 Jan 2015 22:34:50 +0100

Change default line up/down movements to match vim

Diffstat:
M
config.def.h
 | 
20
++++++++++++--------

1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/config.def.h b/config.def.h
@@ -102,8 +102,8 @@ static KeyBinding basic_movement[] = {
 	{ { KEY(SLEFT)              }, movement, { .i = MOVE_LONGWORD_START_PREV } },
 	{ { KEY(RIGHT)              }, movement, { .i = MOVE_CHAR_NEXT           } },
 	{ { KEY(SRIGHT)             }, movement, { .i = MOVE_LONGWORD_START_NEXT } },
-	{ { KEY(UP)                 }, movement, { .i = MOVE_SCREEN_LINE_UP      } },
-	{ { KEY(DOWN)               }, movement, { .i = MOVE_SCREEN_LINE_DOWN    } },
+	{ { KEY(UP)                 }, movement, { .i = MOVE_LINE_UP             } },
+	{ { KEY(DOWN)               }, movement, { .i = MOVE_LINE_DOWN           } },
 	{ { KEY(PPAGE)              }, wscroll,  { .i = -PAGE                    } },
 	{ { KEY(NPAGE)              }, wscroll,  { .i = +PAGE                    } },
 	{ { KEY(HOME)               }, movement, { .i = MOVE_LINE_START          } },
@@ -116,12 +116,16 @@ static KeyBinding vis_movements[] = {
 	{ { NONE('h')               }, movement,     { .i = MOVE_CHAR_PREV           } },
 	{ { NONE(' ')               }, movement,     { .i = MOVE_CHAR_NEXT           } },
 	{ { NONE('l')               }, movement,     { .i = MOVE_CHAR_NEXT           } },
-	{ { NONE('k')               }, movement,     { .i = MOVE_SCREEN_LINE_UP      } },
-	{ { CONTROL('P')            }, movement,     { .i = MOVE_SCREEN_LINE_UP      } },
-	{ { NONE('j')               }, movement,     { .i = MOVE_SCREEN_LINE_DOWN    } },
-	{ { CONTROL('J')            }, movement,     { .i = MOVE_SCREEN_LINE_DOWN    } },
-	{ { CONTROL('N')            }, movement,     { .i = MOVE_SCREEN_LINE_DOWN    } },
-	{ { KEY(ENTER)              }, movement,     { .i = MOVE_SCREEN_LINE_DOWN    } },
+	{ { NONE('k')               }, movement,     { .i = MOVE_LINE_UP             } },
+	{ { CONTROL('P')            }, movement,     { .i = MOVE_LINE_UP             } },
+	{ { NONE('g'), NONE('k')    }, movement,     { .i = MOVE_SCREEN_LINE_UP      } },
+	{ { NONE('g'), KEY(UP)      }, movement,     { .i = MOVE_SCREEN_LINE_UP      } },
+	{ { NONE('j')               }, movement,     { .i = MOVE_LINE_DOWN           } },
+	{ { CONTROL('J')            }, movement,     { .i = MOVE_LINE_DOWN           } },
+	{ { CONTROL('N')            }, movement,     { .i = MOVE_LINE_DOWN           } },
+	{ { KEY(ENTER)              }, movement,     { .i = MOVE_LINE_DOWN           } },
+	{ { NONE('g'), NONE('j')    }, movement,     { .i = MOVE_SCREEN_LINE_DOWN    } },
+	{ { NONE('g'), KEY(DOWN)    }, movement,     { .i = MOVE_SCREEN_LINE_DOWN    } },
 	{ { NONE('^')               }, movement,     { .i = MOVE_LINE_START          } },
 	{ { NONE('g'), NONE('_')    }, movement,     { .i = MOVE_LINE_FINISH         } },
 	{ { NONE('$')               }, movement,     { .i = MOVE_LINE_LASTCHAR       } },