Realign a few code blocks, no functional changes

2 files changed, 142 insertions, 142 deletions

diff --git a/config.def.h b/config.def.h
index 035f7c9..474657c 100644
--- a/config.def.h
+++ b/config.def.h
@@ -92,69 +92,69 @@ static bool vis_keypress(Key *key) {
 }
 
 static KeyBinding basic_movement[] = {
-	{ { KEY(LEFT)               }, movement, { .i = MOVE_CHAR_PREV         } },
-	{ { 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(PPAGE)              }, wscroll,  { .i = -PAGE                  } },
-	{ { KEY(NPAGE)              }, wscroll,  { .i = +PAGE                  } },
-	{ { KEY(HOME)               }, movement, { .i = MOVE_LINE_START        } },
-	{ { KEY(END)                }, movement, { .i = MOVE_LINE_FINISH       } },
-	{ /* empty last element, array terminator */                             },
+	{ { KEY(LEFT)               }, movement, { .i = MOVE_CHAR_PREV           } },
+	{ { 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(PPAGE)              }, wscroll,  { .i = -PAGE                    } },
+	{ { KEY(NPAGE)              }, wscroll,  { .i = +PAGE                    } },
+	{ { KEY(HOME)               }, movement, { .i = MOVE_LINE_START          } },
+	{ { KEY(END)                }, movement, { .i = MOVE_LINE_FINISH         } },
+	{ /* empty last element, array terminator */                               },
 };
 
 static KeyBinding vis_movements[] = {
-	BACKSPACE(                     movement,    i,  MOVE_CHAR_PREV           ),
-	{ { 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('^')               }, movement, { .i = MOVE_LINE_START        } },
-	{ { NONE('g'), NONE('_')    }, movement, { .i = MOVE_LINE_FINISH       } },
-	{ { NONE('$')               }, movement, { .i = MOVE_LINE_LASTCHAR     } },
-	{ { NONE('%')               }, movement, { .i = MOVE_BRACKET_MATCH     } },
-	{ { NONE('b')               }, movement, { .i = MOVE_LONGWORD_START_PREV   } },
-	{ { NONE('B')               }, movement, { .i = MOVE_LONGWORD_START_PREV   } },
-	{ { NONE('w')               }, movement, { .i = MOVE_LONGWORD_START_NEXT   } },
-	{ { NONE('W')               }, movement, { .i = MOVE_LONGWORD_START_NEXT   } },
-	{ { NONE('g'), NONE('e')    }, movement, { .i = MOVE_LONGWORD_END_PREV     } },
-	{ { NONE('g'), NONE('E')    }, movement, { .i = MOVE_LONGWORD_END_PREV     } },
-	{ { NONE('e')               }, movement, { .i = MOVE_LONGWORD_END_NEXT     } },
-	{ { NONE('E')               }, movement, { .i = MOVE_LONGWORD_END_NEXT     } },
-	{ { NONE('{')               }, movement, { .i = MOVE_PARAGRAPH_PREV    } },
-	{ { NONE('}')               }, movement, { .i = MOVE_PARAGRAPH_NEXT    } },
-	{ { NONE('(')               }, movement, { .i = MOVE_SENTENCE_PREV     } },
-	{ { NONE(')')               }, movement, { .i = MOVE_SENTENCE_NEXT     } },
-	{ { NONE('g'), NONE('g')    }, gotoline, { .i = -1                     } },
-	{ { NONE('g'), NONE('0')    }, movement, { .i = MOVE_SCREEN_LINE_BEGIN } },
-	{ { NONE('g'), NONE('m')    }, movement, { .i = MOVE_SCREEN_LINE_MIDDLE} },
-	{ { NONE('g'), NONE('$')    }, movement, { .i = MOVE_SCREEN_LINE_END   } },
-	{ { NONE('G')               }, gotoline, { .i = +1                     } },
-	{ { NONE('|')               }, movement, { .i = MOVE_COLUMN            } },
-	{ { NONE('n')               }, movement, { .i = MOVE_SEARCH_FORWARD    } },
-	{ { NONE('N')               }, movement, { .i = MOVE_SEARCH_BACKWARD   } },
-	{ { NONE('H')               }, movement, { .i = MOVE_WINDOW_LINE_TOP   } },
-	{ { NONE('M')               }, movement, { .i = MOVE_WINDOW_LINE_MIDDLE} },
-	{ { NONE('L')               }, movement, { .i = MOVE_WINDOW_LINE_BOTTOM} },
-	{ { NONE('*')               }, movement, { .i = MOVE_SEARCH_WORD       } },
-	{ { NONE('f')               }, movement_key, { .i = MOVE_RIGHT_TO      } },
-	{ { NONE('F')               }, movement_key, { .i = MOVE_LEFT_TO       } },
-	{ { NONE('t')               }, movement_key, { .i = MOVE_RIGHT_TILL    } },
-	{ { NONE('T')               }, movement_key, { .i = MOVE_LEFT_TILL     } },
-	{ { NONE('/')               }, prompt,        { .s = "/"               } },
-	{ { NONE('?')               }, prompt,        { .s = "?"               } },
-	{ /* empty last element, array terminator */                             },
+	BACKSPACE(                     movement,        i,  MOVE_CHAR_PREV             ),
+	{ { 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('^')               }, movement,     { .i = MOVE_LINE_START          } },
+	{ { NONE('g'), NONE('_')    }, movement,     { .i = MOVE_LINE_FINISH         } },
+	{ { NONE('$')               }, movement,     { .i = MOVE_LINE_LASTCHAR       } },
+	{ { NONE('%')               }, movement,     { .i = MOVE_BRACKET_MATCH       } },
+	{ { NONE('b')               }, movement,     { .i = MOVE_LONGWORD_START_PREV } },
+	{ { NONE('B')               }, movement,     { .i = MOVE_LONGWORD_START_PREV } },
+	{ { NONE('w')               }, movement,     { .i = MOVE_LONGWORD_START_NEXT } },
+	{ { NONE('W')               }, movement,     { .i = MOVE_LONGWORD_START_NEXT } },
+	{ { NONE('g'), NONE('e')    }, movement,     { .i = MOVE_LONGWORD_END_PREV   } },
+	{ { NONE('g'), NONE('E')    }, movement,     { .i = MOVE_LONGWORD_END_PREV   } },
+	{ { NONE('e')               }, movement,     { .i = MOVE_LONGWORD_END_NEXT   } },
+	{ { NONE('E')               }, movement,     { .i = MOVE_LONGWORD_END_NEXT   } },
+	{ { NONE('{')               }, movement,     { .i = MOVE_PARAGRAPH_PREV      } },
+	{ { NONE('}')               }, movement,     { .i = MOVE_PARAGRAPH_NEXT      } },
+	{ { NONE('(')               }, movement,     { .i = MOVE_SENTENCE_PREV       } },
+	{ { NONE(')')               }, movement,     { .i = MOVE_SENTENCE_NEXT       } },
+	{ { NONE('g'), NONE('g')    }, gotoline,     { .i = -1                       } },
+	{ { NONE('g'), NONE('0')    }, movement,     { .i = MOVE_SCREEN_LINE_BEGIN   } },
+	{ { NONE('g'), NONE('m')    }, movement,     { .i = MOVE_SCREEN_LINE_MIDDLE  } },
+	{ { NONE('g'), NONE('$')    }, movement,     { .i = MOVE_SCREEN_LINE_END     } },
+	{ { NONE('G')               }, gotoline,     { .i = +1                       } },
+	{ { NONE('|')               }, movement,     { .i = MOVE_COLUMN              } },
+	{ { NONE('n')               }, movement,     { .i = MOVE_SEARCH_FORWARD      } },
+	{ { NONE('N')               }, movement,     { .i = MOVE_SEARCH_BACKWARD     } },
+	{ { NONE('H')               }, movement,     { .i = MOVE_WINDOW_LINE_TOP     } },
+	{ { NONE('M')               }, movement,     { .i = MOVE_WINDOW_LINE_MIDDLE  } },
+	{ { NONE('L')               }, movement,     { .i = MOVE_WINDOW_LINE_BOTTOM  } },
+	{ { NONE('*')               }, movement,     { .i = MOVE_SEARCH_WORD         } },
+	{ { NONE('f')               }, movement_key, { .i = MOVE_RIGHT_TO            } },
+	{ { NONE('F')               }, movement_key, { .i = MOVE_LEFT_TO             } },
+	{ { NONE('t')               }, movement_key, { .i = MOVE_RIGHT_TILL          } },
+	{ { NONE('T')               }, movement_key, { .i = MOVE_LEFT_TILL           } },
+	{ { NONE('/')               }, prompt,       { .s = "/"                      } },
+	{ { NONE('?')               }, prompt,       { .s = "?"                      } },
+	{ /* empty last element, array terminator */                                   },
 };
 
 static KeyBinding vis_textobjs[] = {
-	{ { NONE('a'), NONE('w')  }, textobj, { .i = TEXT_OBJ_LONGWORD                 } },
+	{ { NONE('a'), NONE('w')  }, textobj, { .i = TEXT_OBJ_LONGWORD             } },
 	{ { NONE('a'), NONE('s')  }, textobj, { .i = TEXT_OBJ_SENTENCE             } },
 	{ { NONE('a'), NONE('p')  }, textobj, { .i = TEXT_OBJ_PARAGRAPH            } },
 	{ { NONE('a'), NONE('[')  }, textobj, { .i = TEXT_OBJ_OUTER_SQUARE_BRACKET } },
@@ -299,35 +299,35 @@ static KeyBinding vis_marks[] = {
 };
 
 static KeyBinding vis_marks_line[] = {
-	{ { NONE('\''), NONE('a')   }, mark_line,     { .i = MARK_a          } },
-	{ { NONE('\''), NONE('b')   }, mark_line,     { .i = MARK_b          } },
-	{ { NONE('\''), NONE('c')   }, mark_line,     { .i = MARK_c          } },
-	{ { NONE('\''), NONE('d')   }, mark_line,     { .i = MARK_d          } },
-	{ { NONE('\''), NONE('e')   }, mark_line,     { .i = MARK_e          } },
-	{ { NONE('\''), NONE('f')   }, mark_line,     { .i = MARK_f          } },
-	{ { NONE('\''), NONE('g')   }, mark_line,     { .i = MARK_g          } },
-	{ { NONE('\''), NONE('h')   }, mark_line,     { .i = MARK_h          } },
-	{ { NONE('\''), NONE('i')   }, mark_line,     { .i = MARK_i          } },
-	{ { NONE('\''), NONE('j')   }, mark_line,     { .i = MARK_j          } },
-	{ { NONE('\''), NONE('k')   }, mark_line,     { .i = MARK_k          } },
-	{ { NONE('\''), NONE('l')   }, mark_line,     { .i = MARK_l          } },
-	{ { NONE('\''), NONE('m')   }, mark_line,     { .i = MARK_m          } },
-	{ { NONE('\''), NONE('n')   }, mark_line,     { .i = MARK_n          } },
-	{ { NONE('\''), NONE('o')   }, mark_line,     { .i = MARK_o          } },
-	{ { NONE('\''), NONE('p')   }, mark_line,     { .i = MARK_p          } },
-	{ { NONE('\''), NONE('q')   }, mark_line,     { .i = MARK_q          } },
-	{ { NONE('\''), NONE('r')   }, mark_line,     { .i = MARK_r          } },
-	{ { NONE('\''), NONE('s')   }, mark_line,     { .i = MARK_s          } },
-	{ { NONE('\''), NONE('t')   }, mark_line,     { .i = MARK_t          } },
-	{ { NONE('\''), NONE('u')   }, mark_line,     { .i = MARK_u          } },
-	{ { NONE('\''), NONE('v')   }, mark_line,     { .i = MARK_v          } },
-	{ { NONE('\''), NONE('w')   }, mark_line,     { .i = MARK_w          } },
-	{ { NONE('\''), NONE('x')   }, mark_line,     { .i = MARK_x          } },
-	{ { NONE('\''), NONE('y')   }, mark_line,     { .i = MARK_y          } },
-	{ { NONE('\''), NONE('z')   }, mark_line,     { .i = MARK_z          } },
+	{ { NONE('\''), NONE('a')   }, mark_line, { .i = MARK_a               } },
+	{ { NONE('\''), NONE('b')   }, mark_line, { .i = MARK_b               } },
+	{ { NONE('\''), NONE('c')   }, mark_line, { .i = MARK_c               } },
+	{ { NONE('\''), NONE('d')   }, mark_line, { .i = MARK_d               } },
+	{ { NONE('\''), NONE('e')   }, mark_line, { .i = MARK_e               } },
+	{ { NONE('\''), NONE('f')   }, mark_line, { .i = MARK_f               } },
+	{ { NONE('\''), NONE('g')   }, mark_line, { .i = MARK_g               } },
+	{ { NONE('\''), NONE('h')   }, mark_line, { .i = MARK_h               } },
+	{ { NONE('\''), NONE('i')   }, mark_line, { .i = MARK_i               } },
+	{ { NONE('\''), NONE('j')   }, mark_line, { .i = MARK_j               } },
+	{ { NONE('\''), NONE('k')   }, mark_line, { .i = MARK_k               } },
+	{ { NONE('\''), NONE('l')   }, mark_line, { .i = MARK_l               } },
+	{ { NONE('\''), NONE('m')   }, mark_line, { .i = MARK_m               } },
+	{ { NONE('\''), NONE('n')   }, mark_line, { .i = MARK_n               } },
+	{ { NONE('\''), NONE('o')   }, mark_line, { .i = MARK_o               } },
+	{ { NONE('\''), NONE('p')   }, mark_line, { .i = MARK_p               } },
+	{ { NONE('\''), NONE('q')   }, mark_line, { .i = MARK_q               } },
+	{ { NONE('\''), NONE('r')   }, mark_line, { .i = MARK_r               } },
+	{ { NONE('\''), NONE('s')   }, mark_line, { .i = MARK_s               } },
+	{ { NONE('\''), NONE('t')   }, mark_line, { .i = MARK_t               } },
+	{ { NONE('\''), NONE('u')   }, mark_line, { .i = MARK_u               } },
+	{ { NONE('\''), NONE('v')   }, mark_line, { .i = MARK_v               } },
+	{ { NONE('\''), NONE('w')   }, mark_line, { .i = MARK_w               } },
+	{ { NONE('\''), NONE('x')   }, mark_line, { .i = MARK_x               } },
+	{ { NONE('\''), NONE('y')   }, mark_line, { .i = MARK_y               } },
+	{ { NONE('\''), NONE('z')   }, mark_line, { .i = MARK_z               } },
 	{ { NONE('\''), NONE('<')   }, mark_line, { .i = MARK_SELECTION_START } },
 	{ { NONE('\''), NONE('>')   }, mark_line, { .i = MARK_SELECTION_END   } },
-	{ /* empty last element, array terminator */                           },
+	{ /* empty last element, array terminator */                            },
 };
 
 static KeyBinding vis_marks_set[] = {
@@ -402,19 +402,19 @@ static KeyBinding vis_mode_normal[] = {
 };
 
 static KeyBinding vis_mode_visual[] = {
-	{ { NONE(ESC)               }, switchmode,      { .i = VIS_MODE_NORMAL   } },
-	{ { CONTROL('c')            }, switchmode,      { .i = VIS_MODE_NORMAL   } },
-	{ { NONE('v')               }, switchmode,      { .i = VIS_MODE_NORMAL   } },
-	{ { NONE('V')               }, switchmode,      { .i = VIS_MODE_VISUAL_LINE } },
-	BACKSPACE(                     operator,           i,  OP_DELETE           ),
-	{ { CONTROL('H')            }, operator,        { .i = OP_DELETE         } },
-	{ { NONE('d')               }, operator,        { .i = OP_DELETE         } },
-	{ { NONE('x')               }, operator,        { .i = OP_DELETE         } },
-	{ { NONE('y')               }, operator,        { .i = OP_YANK           } },
-	{ { NONE('c')               }, operator,        { .i = OP_CHANGE         } },
-	{ { NONE('r')               }, operator,        { .i = OP_CHANGE         } },
-	{ { NONE('s')               }, operator,        { .i = OP_CHANGE         } },
-	{ /* empty last element, array terminator */                               },
+	BACKSPACE(                     operator,          i,  OP_DELETE              ),
+	{ { NONE(ESC)               }, switchmode,     { .i = VIS_MODE_NORMAL      } },
+	{ { CONTROL('c')            }, switchmode,     { .i = VIS_MODE_NORMAL      } },
+	{ { NONE('v')               }, switchmode,     { .i = VIS_MODE_NORMAL      } },
+	{ { NONE('V')               }, switchmode,     { .i = VIS_MODE_VISUAL_LINE } },
+	{ { CONTROL('H')            }, operator,       { .i = OP_DELETE            } },
+	{ { NONE('d')               }, operator,       { .i = OP_DELETE            } },
+	{ { NONE('x')               }, operator,       { .i = OP_DELETE            } },
+	{ { NONE('y')               }, operator,       { .i = OP_YANK              } },
+	{ { NONE('c')               }, operator,       { .i = OP_CHANGE            } },
+	{ { NONE('r')               }, operator,       { .i = OP_CHANGE            } },
+	{ { NONE('s')               }, operator,       { .i = OP_CHANGE            } },
+	{ /* empty last element, array terminator */                                 },
 };
 
 static void vis_mode_visual_enter(Mode *old) {
@@ -447,13 +447,13 @@ static void vis_mode_visual_line_leave(Mode *new) {
 }
 
 static KeyBinding vis_mode_readline[] = {
-	{ { NONE(ESC)               }, switchmode,      { .i = VIS_MODE_NORMAL      } },
-	{ { CONTROL('c')            }, switchmode,      { .i = VIS_MODE_NORMAL      } },
-	BACKSPACE(                     call,               f,  editor_backspace_key   ),
-	{ { CONTROL('D')            }, call,            { .f = editor_delete_key    } },
+	BACKSPACE(                     call,               f,  editor_backspace_key       ),
+	{ { NONE(ESC)               }, switchmode,      { .i = VIS_MODE_NORMAL          } },
+	{ { CONTROL('c')            }, switchmode,      { .i = VIS_MODE_NORMAL          } },
+	{ { CONTROL('D')            }, call,            { .f = editor_delete_key        } },
 	{ { CONTROL('W')            }, delete,          { .i = MOVE_LONGWORD_START_PREV } },
-	{ { CONTROL('U')            }, delete,          { .i = MOVE_LINE_BEGIN      } },
-	{ /* empty last element, array terminator */                                  },
+	{ { CONTROL('U')            }, delete,          { .i = MOVE_LINE_BEGIN          } },
+	{ /* empty last element, array terminator */                                      },
 };
 
 static KeyBinding vis_mode_prompt[] = {
diff --git a/vis.c b/vis.c
index 16e7385..0bd5037 100644
--- a/vis.c
+++ b/vis.c
@@ -262,49 +262,49 @@ static size_t window_lines_middle(const Arg *arg);
 static size_t window_lines_bottom(const Arg *arg);
 
 static Movement moves[] = {
-	[MOVE_SCREEN_LINE_UP]  = { .win = window_line_up                                   },
-	[MOVE_SCREEN_LINE_DOWN]= { .win = window_line_down                                 },
-	[MOVE_SCREEN_LINE_BEGIN]  = { .win = window_line_begin, .type = CHARWISE           },
-	[MOVE_SCREEN_LINE_MIDDLE] = { .win = window_line_middle,.type = CHARWISE           },
-	[MOVE_SCREEN_LINE_END]    = { .win = window_line_end,   .type = CHARWISE|INCLUSIVE },
-	[MOVE_LINE_PREV]       = { .txt = text_line_prev,       .type = LINEWISE           },
-	[MOVE_LINE_BEGIN]      = { .txt = text_line_begin,      .type = LINEWISE           },
-	[MOVE_LINE_START]      = { .txt = text_line_start,      .type = LINEWISE           },
-	[MOVE_LINE_FINISH]     = { .txt = text_line_finish,     .type = LINEWISE           },
-	[MOVE_LINE_LASTCHAR]   = { .txt = text_line_lastchar,   .type = LINEWISE|INCLUSIVE },
-	[MOVE_LINE_END]        = { .txt = text_line_end,        .type = LINEWISE           },
-	[MOVE_LINE_NEXT]       = { .txt = text_line_next,       .type = LINEWISE           },
-	[MOVE_LINE]            = { .cmd = line,                 .type = LINEWISE|IDEMPOTENT},
-	[MOVE_COLUMN]          = { .cmd = column,               .type = CHARWISE|IDEMPOTENT},
-	[MOVE_CHAR_PREV]       = { .win = window_char_prev                                 },
-	[MOVE_CHAR_NEXT]       = { .win = window_char_next                                 },
-	[MOVE_WORD_START_PREV] = { .txt = text_word_start_prev, .type = CHARWISE           },
-	[MOVE_WORD_START_NEXT] = { .txt = text_word_start_next, .type = CHARWISE           },
-	[MOVE_WORD_END_PREV]   = { .txt = text_word_end_prev,   .type = CHARWISE|INCLUSIVE },
-	[MOVE_WORD_END_NEXT]   = { .txt = text_word_end_next,   .type = CHARWISE|INCLUSIVE },
+	[MOVE_SCREEN_LINE_UP]      = { .win = window_line_up                                       },
+	[MOVE_SCREEN_LINE_DOWN]    = { .win = window_line_down                                     },
+	[MOVE_SCREEN_LINE_BEGIN]   = { .win = window_line_begin,        .type = CHARWISE           },
+	[MOVE_SCREEN_LINE_MIDDLE]  = { .win = window_line_middle,       .type = CHARWISE           },
+	[MOVE_SCREEN_LINE_END]     = { .win = window_line_end,          .type = CHARWISE|INCLUSIVE },
+	[MOVE_LINE_PREV]           = { .txt = text_line_prev,           .type = LINEWISE           },
+	[MOVE_LINE_BEGIN]          = { .txt = text_line_begin,          .type = LINEWISE           },
+	[MOVE_LINE_START]          = { .txt = text_line_start,          .type = LINEWISE           },
+	[MOVE_LINE_FINISH]         = { .txt = text_line_finish,         .type = LINEWISE           },
+	[MOVE_LINE_LASTCHAR]       = { .txt = text_line_lastchar,       .type = LINEWISE|INCLUSIVE },
+	[MOVE_LINE_END]            = { .txt = text_line_end,            .type = LINEWISE           },
+	[MOVE_LINE_NEXT]           = { .txt = text_line_next,           .type = LINEWISE           },
+	[MOVE_LINE]                = { .cmd = line,                     .type = LINEWISE|IDEMPOTENT},
+	[MOVE_COLUMN]              = { .cmd = column,                   .type = CHARWISE|IDEMPOTENT},
+	[MOVE_CHAR_PREV]           = { .win = window_char_prev                                     },
+	[MOVE_CHAR_NEXT]           = { .win = window_char_next                                     },
+	[MOVE_WORD_START_PREV]     = { .txt = text_word_start_prev,     .type = CHARWISE           },
+	[MOVE_WORD_START_NEXT]     = { .txt = text_word_start_next,     .type = CHARWISE           },
+	[MOVE_WORD_END_PREV]       = { .txt = text_word_end_prev,       .type = CHARWISE|INCLUSIVE },
+	[MOVE_WORD_END_NEXT]       = { .txt = text_word_end_next,       .type = CHARWISE|INCLUSIVE },
 	[MOVE_LONGWORD_START_PREV] = { .txt = text_longword_start_prev, .type = CHARWISE           },
 	[MOVE_LONGWORD_START_NEXT] = { .txt = text_longword_start_next, .type = CHARWISE           },
 	[MOVE_LONGWORD_END_PREV]   = { .txt = text_longword_end_prev,   .type = CHARWISE|INCLUSIVE },
 	[MOVE_LONGWORD_END_NEXT]   = { .txt = text_longword_end_next,   .type = CHARWISE|INCLUSIVE },
-	[MOVE_SENTENCE_PREV]   = { .txt = text_sentence_prev,   .type = LINEWISE           },
-	[MOVE_SENTENCE_NEXT]   = { .txt = text_sentence_next,   .type = LINEWISE           },
-	[MOVE_PARAGRAPH_PREV]  = { .txt = text_paragraph_prev,  .type = LINEWISE           },
-	[MOVE_PARAGRAPH_NEXT]  = { .txt = text_paragraph_next,  .type = LINEWISE           },
-	[MOVE_BRACKET_MATCH]   = { .txt = text_bracket_match,   .type = LINEWISE|INCLUSIVE },
-	[MOVE_FILE_BEGIN]      = { .txt = text_begin,           .type = LINEWISE           },
-	[MOVE_FILE_END]        = { .txt = text_end,             .type = LINEWISE           },
-	[MOVE_LEFT_TO]         = { .cmd = to_left,              .type = LINEWISE           },
-	[MOVE_RIGHT_TO]        = { .cmd = to,                   .type = LINEWISE|INCLUSIVE },
-	[MOVE_LEFT_TILL]       = { .cmd = till_left,            .type = LINEWISE           },
-	[MOVE_RIGHT_TILL]      = { .cmd = till,                 .type = LINEWISE|INCLUSIVE },
-	[MOVE_MARK]            = { .cmd = mark_goto,            .type = LINEWISE           },
-	[MOVE_MARK_LINE]       = { .cmd = mark_line_goto,       .type = LINEWISE           },
-	[MOVE_SEARCH_WORD]     = { .cmd = search_word,          .type = LINEWISE           },
-	[MOVE_SEARCH_FORWARD]  = { .cmd = search_forward,       .type = LINEWISE           },
-	[MOVE_SEARCH_BACKWARD] = { .cmd = search_backward,      .type = LINEWISE           },
-	[MOVE_WINDOW_LINE_TOP]    = { .cmd = window_lines_top,   .type = LINEWISE           },
-	[MOVE_WINDOW_LINE_MIDDLE] = { .cmd = window_lines_middle,.type = LINEWISE           },
-	[MOVE_WINDOW_LINE_BOTTOM] = { .cmd = window_lines_bottom,.type = LINEWISE           },
+	[MOVE_SENTENCE_PREV]       = { .txt = text_sentence_prev,       .type = LINEWISE           },
+	[MOVE_SENTENCE_NEXT]       = { .txt = text_sentence_next,       .type = LINEWISE           },
+	[MOVE_PARAGRAPH_PREV]      = { .txt = text_paragraph_prev,      .type = LINEWISE           },
+	[MOVE_PARAGRAPH_NEXT]      = { .txt = text_paragraph_next,      .type = LINEWISE           },
+	[MOVE_BRACKET_MATCH]       = { .txt = text_bracket_match,       .type = LINEWISE|INCLUSIVE },
+	[MOVE_FILE_BEGIN]          = { .txt = text_begin,               .type = LINEWISE           },
+	[MOVE_FILE_END]            = { .txt = text_end,                 .type = LINEWISE           },
+	[MOVE_LEFT_TO]             = { .cmd = to_left,                  .type = LINEWISE           },
+	[MOVE_RIGHT_TO]            = { .cmd = to,                       .type = LINEWISE|INCLUSIVE },
+	[MOVE_LEFT_TILL]           = { .cmd = till_left,                .type = LINEWISE           },
+	[MOVE_RIGHT_TILL]          = { .cmd = till,                     .type = LINEWISE|INCLUSIVE },
+	[MOVE_MARK]                = { .cmd = mark_goto,                .type = LINEWISE           },
+	[MOVE_MARK_LINE]           = { .cmd = mark_line_goto,           .type = LINEWISE           },
+	[MOVE_SEARCH_WORD]         = { .cmd = search_word,              .type = LINEWISE           },
+	[MOVE_SEARCH_FORWARD]      = { .cmd = search_forward,           .type = LINEWISE           },
+	[MOVE_SEARCH_BACKWARD]     = { .cmd = search_backward,          .type = LINEWISE           },
+	[MOVE_WINDOW_LINE_TOP]     = { .cmd = window_lines_top,         .type = LINEWISE           },
+	[MOVE_WINDOW_LINE_MIDDLE]  = { .cmd = window_lines_middle,      .type = LINEWISE           },
+	[MOVE_WINDOW_LINE_BOTTOM]  = { .cmd = window_lines_bottom,      .type = LINEWISE           },
 };
 
 /* these can be passed as int argument to textobj(&(const Arg){ .i = TEXT_OBJ_* }) */