Sort keybinding alphabetically.

This makes easy both:
- to find out what a key does, and
- to discover new key movements.

Also improves documentation when using `:help` command.

1 files changed, 189 insertions, 189 deletions

diff --git a/config.def.h b/config.def.h
index 26ff499..3441536 100644
--- a/config.def.h
+++ b/config.def.h
@@ -9,130 +9,130 @@ static const char *keymaps[] = {
 
 static const KeyBinding bindings_basic[] = {
 	{ "<C-z>",              ACTION(EDITOR_SUSPEND)                      },
+	{ "<Down>",             ACTION(CURSOR_LINE_DOWN)                    },
+	{ "<End>",              ACTION(CURSOR_LINE_END)                     },
+	{ "<Home>",             ACTION(CURSOR_LINE_BEGIN)                   },
 	{ "<Left>",             ACTION(CURSOR_CHAR_PREV)                    },
-	{ "<S-Left>",           ACTION(CURSOR_LONGWORD_START_PREV)          },
+	{ "<PageDown>",         ACTION(WINDOW_PAGE_DOWN)                    },
+	{ "<PageUp>",           ACTION(WINDOW_PAGE_UP)                      },
 	{ "<Right>",            ACTION(CURSOR_CHAR_NEXT)                    },
+	{ "<S-Left>",           ACTION(CURSOR_LONGWORD_START_PREV)          },
+	{ "<S-PageDown>",       ACTION(WINDOW_HALFPAGE_DOWN)                },
+	{ "<S-PageUp>",         ACTION(WINDOW_HALFPAGE_UP)                  },
 	{ "<S-Right>",          ACTION(CURSOR_LONGWORD_START_NEXT)          },
 	{ "<Up>",               ACTION(CURSOR_LINE_UP)                      },
-	{ "<Down>",             ACTION(CURSOR_LINE_DOWN)                    },
-	{ "<PageUp>",           ACTION(WINDOW_PAGE_UP)                      },
-	{ "<PageDown>",         ACTION(WINDOW_PAGE_DOWN)                    },
-	{ "<S-PageUp>",         ACTION(WINDOW_HALFPAGE_UP)                  },
-	{ "<S-PageDown>",       ACTION(WINDOW_HALFPAGE_DOWN)                },
-	{ "<Home>",             ACTION(CURSOR_LINE_BEGIN)                   },
-	{ "<End>",              ACTION(CURSOR_LINE_END)                     },
 	{ 0 /* empty last element, array terminator */                      },
 };
 
 static const KeyBinding bindings_motions[] = {
-	{ "h",                  ACTION(CURSOR_CHAR_PREV)                    },
+	{ "|",                  ACTION(CURSOR_COLUMN)                       },
+	{ "]]",                 ACTION(CURSOR_FUNCTION_END_NEXT)            },
+	{ "[]",                 ACTION(CURSOR_FUNCTION_END_PREV)            },
+	{ "][",                 ACTION(CURSOR_FUNCTION_START_NEXT)          },
+	{ "[[",                 ACTION(CURSOR_FUNCTION_START_PREV)          },
+	{ "$",                  ACTION(CURSOR_LINE_LASTCHAR)                },
+	{ "^",                  ACTION(CURSOR_LINE_START)                   },
+	{ "}",                  ACTION(CURSOR_PARAGRAPH_NEXT)               },
+	{ "{",                  ACTION(CURSOR_PARAGRAPH_PREV)               },
+	{ "%",                  ACTION(CURSOR_PERCENT)                      },
+	{ "#",                  ACTION(CURSOR_SEARCH_WORD_BACKWARD)         },
+	{ "*",                  ACTION(CURSOR_SEARCH_WORD_FORWARD)          },
+	{ ")",                  ACTION(CURSOR_SENTENCE_NEXT)                },
+	{ "(",                  ACTION(CURSOR_SENTENCE_PREV)                },
+	{ "`",                  ACTION(MARK_GOTO)                           },
+	{ "'",                  ACTION(MARK_GOTO_LINE)                      },
+	{ "?",                  ACTION(PROMPT_SEARCH_BACKWARD)              },
+	{ "/",                  ACTION(PROMPT_SEARCH_FORWARD)               },
+	{ ";",                  ACTION(TOTILL_REPEAT)                       },
+	{ ",",                  ACTION(TOTILL_REVERSE)                      },
+	{ "+",                  ALIAS("j^")                                 },
+	{ "-",                  ALIAS("k^")                                 },
+	{ " ",                  ALIAS("l")                                  },
 	{ "<Backspace>",        ALIAS("h")                                  },
+	{ "B",                  ACTION(CURSOR_LONGWORD_START_PREV)          },
+	{ "b",                  ACTION(CURSOR_WORD_START_PREV)              },
 	{ "<C-h>",              ALIAS("<Backspace>")                        },
-	{ "l",                  ACTION(CURSOR_CHAR_NEXT)                    },
-	{ " ",                  ALIAS("l")                                  },
-	{ "k",                  ACTION(CURSOR_LINE_UP)                      },
-	{ "<C-p>",              ALIAS("k")                                  },
-	{ "j",                  ACTION(CURSOR_LINE_DOWN)                    },
 	{ "<C-j>",              ALIAS("j")                                  },
 	{ "<C-n>",              ALIAS("j")                                  },
+	{ "<C-p>",              ALIAS("k")                                  },
+	{ "E",                  ACTION(CURSOR_LONGWORD_END_NEXT)            },
+	{ "e",                  ACTION(CURSOR_WORD_END_NEXT)                },
 	{ "<Enter>",            ALIAS("j")                                  },
-	{ "gk",                 ACTION(CURSOR_SCREEN_LINE_UP)               },
-	{ "g<Up>",              ALIAS("gk")                                 },
-	{ "gj",                 ACTION(CURSOR_SCREEN_LINE_DOWN)             },
-	{ "g<Down>",            ALIAS("gj")                                 },
-	{ "^",                  ACTION(CURSOR_LINE_START)                   },
+	{ "F",                  ACTION(TO_LEFT)                             },
+	{ "f",                  ACTION(TO_RIGHT)                            },
+	{ "g0",                 ACTION(CURSOR_SCREEN_LINE_BEGIN)            },
 	{ "g_",                 ACTION(CURSOR_LINE_FINISH)                  },
-	{ "$",                  ACTION(CURSOR_LINE_LASTCHAR)                },
-	{ "+",                  ALIAS("j^")                                 },
-	{ "-",                  ALIAS("k^")                                 },
-	{ "%",                  ACTION(CURSOR_PERCENT)                      },
-	{ "b",                  ACTION(CURSOR_WORD_START_PREV)              },
-	{ "B",                  ACTION(CURSOR_LONGWORD_START_PREV)          },
-	{ "w",                  ACTION(CURSOR_WORD_START_NEXT)              },
-	{ "W",                  ACTION(CURSOR_LONGWORD_START_NEXT)          },
-	{ "ge",                 ACTION(CURSOR_WORD_END_PREV)                },
+	{ "G",                  ACTION(CURSOR_LINE_LAST)                    },
+	{ "g$",                 ACTION(CURSOR_SCREEN_LINE_END)              },
+	{ "g<Down>",            ALIAS("gj")                                 },
 	{ "gE",                 ACTION(CURSOR_LONGWORD_END_PREV)            },
-	{ "e",                  ACTION(CURSOR_WORD_END_NEXT)                },
-	{ "E",                  ACTION(CURSOR_LONGWORD_END_NEXT)            },
-	{ "{",                  ACTION(CURSOR_PARAGRAPH_PREV)               },
-	{ "}",                  ACTION(CURSOR_PARAGRAPH_NEXT)               },
-	{ "(",                  ACTION(CURSOR_SENTENCE_PREV)                },
-	{ ")",                  ACTION(CURSOR_SENTENCE_NEXT)                },
-	{ "[[",                 ACTION(CURSOR_FUNCTION_START_PREV)          },
-	{ "[]",                 ACTION(CURSOR_FUNCTION_END_PREV)            },
-	{ "][",                 ACTION(CURSOR_FUNCTION_START_NEXT)          },
-	{ "]]",                 ACTION(CURSOR_FUNCTION_END_NEXT)            },
+	{ "ge",                 ACTION(CURSOR_WORD_END_PREV)                },
 	{ "gg",                 ACTION(CURSOR_LINE_FIRST)                   },
-	{ "g0",                 ACTION(CURSOR_SCREEN_LINE_BEGIN)            },
+	{ "gj",                 ACTION(CURSOR_SCREEN_LINE_DOWN)             },
+	{ "gk",                 ACTION(CURSOR_SCREEN_LINE_UP)               },
 	{ "gm",                 ACTION(CURSOR_SCREEN_LINE_MIDDLE)           },
-	{ "g$",                 ACTION(CURSOR_SCREEN_LINE_END)              },
-	{ "G",                  ACTION(CURSOR_LINE_LAST)                    },
-	{ "|",                  ACTION(CURSOR_COLUMN)                       },
-	{ "n",                  ACTION(CURSOR_SEARCH_NEXT)                  },
-	{ "N",                  ACTION(CURSOR_SEARCH_PREV)                  },
+	{ "g<Up>",              ALIAS("gk")                                 },
+	{ "h",                  ACTION(CURSOR_CHAR_PREV)                    },
 	{ "H",                  ACTION(CURSOR_WINDOW_LINE_TOP)              },
-	{ "M",                  ACTION(CURSOR_WINDOW_LINE_MIDDLE)           },
+	{ "j",                  ACTION(CURSOR_LINE_DOWN)                    },
+	{ "k",                  ACTION(CURSOR_LINE_UP)                      },
+	{ "l",                  ACTION(CURSOR_CHAR_NEXT)                    },
 	{ "L",                  ACTION(CURSOR_WINDOW_LINE_BOTTOM)           },
-	{ "*",                  ACTION(CURSOR_SEARCH_WORD_FORWARD)          },
-	{ "#",                  ACTION(CURSOR_SEARCH_WORD_BACKWARD)         },
-	{ "f",                  ACTION(TO_RIGHT)                            },
-	{ "F",                  ACTION(TO_LEFT)                             },
-	{ "t",                  ACTION(TILL_RIGHT)                          },
+	{ "M",                  ACTION(CURSOR_WINDOW_LINE_MIDDLE)           },
+	{ "n",                  ACTION(CURSOR_SEARCH_NEXT)                  },
+	{ "N",                  ACTION(CURSOR_SEARCH_PREV)                  },
 	{ "T",                  ACTION(TILL_LEFT)                           },
-	{ ";",                  ACTION(TOTILL_REPEAT)                       },
-	{ ",",                  ACTION(TOTILL_REVERSE)                      },
-	{ "/",                  ACTION(PROMPT_SEARCH_FORWARD)               },
-	{ "?",                  ACTION(PROMPT_SEARCH_BACKWARD)              },
-	{ "`",                  ACTION(MARK_GOTO)                           },
-	{ "'",                  ACTION(MARK_GOTO_LINE)                      },
+	{ "t",                  ACTION(TILL_RIGHT)                          },
+	{ "W",                  ACTION(CURSOR_LONGWORD_START_NEXT)          },
+	{ "w",                  ACTION(CURSOR_WORD_START_NEXT)              },
 	{ 0 /* empty last element, array terminator */                      },
 };
 
 static const KeyBinding bindings_textobjects[] = {
-	{ "aw",                 ACTION(TEXT_OBJECT_WORD_OUTER)              },
-	{ "aW",                 ACTION(TEXT_OBJECT_LONGWORD_OUTER)          },
-	{ "as",                 ACTION(TEXT_OBJECT_SENTENCE)                },
-	{ "ap",                 ACTION(TEXT_OBJECT_PARAGRAPH)               },
-	{ "a[",                 ACTION(TEXT_OBJECT_SQUARE_BRACKET_OUTER)    },
-	{ "a]",                 ALIAS("a[")                                 },
-	{ "a(",                 ACTION(TEXT_OBJECT_PARANTHESE_OUTER)        },
-	{ "a)",                 ALIAS("a(")                                 },
-	{ "ab",                 ALIAS("a(")                                 },
 	{ "a<",                 ACTION(TEXT_OBJECT_ANGLE_BRACKET_OUTER)     },
-	{ "a>",                 ALIAS("a<")                                 },
+	{ "a`",                 ACTION(TEXT_OBJECT_BACKTICK_OUTER)          },
 	{ "a{",                 ACTION(TEXT_OBJECT_CURLY_BRACKET_OUTER)     },
-	{ "a}",                 ALIAS("a{")                                 },
-	{ "aB",                 ALIAS("a{")                                 },
+	{ "a(",                 ACTION(TEXT_OBJECT_PARANTHESE_OUTER)        },
 	{ "a\"",                ACTION(TEXT_OBJECT_QUOTE_OUTER)             },
 	{ "a\'",                ACTION(TEXT_OBJECT_SINGLE_QUOTE_OUTER)      },
-	{ "a`",                 ACTION(TEXT_OBJECT_BACKTICK_OUTER)          },
+	{ "a[",                 ACTION(TEXT_OBJECT_SQUARE_BRACKET_OUTER)    },
+	{ "a>",                 ALIAS("a<")                                 },
+	{ "a)",                 ALIAS("a(")                                 },
+	{ "a]",                 ALIAS("a[")                                 },
+	{ "a}",                 ALIAS("a{")                                 },
+	{ "ab",                 ALIAS("a(")                                 },
+	{ "aB",                 ALIAS("a{")                                 },
 	{ "ae",                 ACTION(TEXT_OBJECT_ENTIRE_OUTER)            },
 	{ "af",                 ACTION(TEXT_OBJECT_FUNCTION_OUTER)          },
 	{ "al",                 ACTION(TEXT_OBJECT_LINE_OUTER)              },
-	{ "iw",                 ACTION(TEXT_OBJECT_WORD_INNER)              },
-	{ "iW",                 ACTION(TEXT_OBJECT_LONGWORD_INNER)          },
-	{ "is",                 ACTION(TEXT_OBJECT_SENTENCE)                },
-	{ "ip",                 ACTION(TEXT_OBJECT_PARAGRAPH)               },
-	{ "i[",                 ACTION(TEXT_OBJECT_SQUARE_BRACKET_INNER)    },
-	{ "i]",                 ALIAS("i[")                                 },
-	{ "i(",                 ACTION(TEXT_OBJECT_PARANTHESE_INNER)        },
-	{ "i)",                 ALIAS("i(")                                 },
-	{ "ib",                 ALIAS("i(")                                 },
+	{ "ap",                 ACTION(TEXT_OBJECT_PARAGRAPH)               },
+	{ "as",                 ACTION(TEXT_OBJECT_SENTENCE)                },
+	{ "a<Tab>",             ACTION(TEXT_OBJECT_INDENTATION)             },
+	{ "aW",                 ACTION(TEXT_OBJECT_LONGWORD_OUTER)          },
+	{ "aw",                 ACTION(TEXT_OBJECT_WORD_OUTER)              },
+	{ "gN",                 ACTION(TEXT_OBJECT_SEARCH_BACKWARD)         },
+	{ "gn",                 ACTION(TEXT_OBJECT_SEARCH_FORWARD)          },
 	{ "i<",                 ACTION(TEXT_OBJECT_ANGLE_BRACKET_INNER)     },
-	{ "i>",                 ALIAS("i<")                                 },
+	{ "i`",                 ACTION(TEXT_OBJECT_BACKTICK_INNER)          },
 	{ "i{",                 ACTION(TEXT_OBJECT_CURLY_BRACKET_INNER)     },
-	{ "i}",                 ALIAS("i{")                                 },
-	{ "iB",                 ALIAS("i{")                                 },
+	{ "i(",                 ACTION(TEXT_OBJECT_PARANTHESE_INNER)        },
 	{ "i\"",                ACTION(TEXT_OBJECT_QUOTE_INNER)             },
 	{ "i\'",                ACTION(TEXT_OBJECT_SINGLE_QUOTE_INNER)      },
-	{ "i`",                 ACTION(TEXT_OBJECT_BACKTICK_INNER)          },
+	{ "i[",                 ACTION(TEXT_OBJECT_SQUARE_BRACKET_INNER)    },
+	{ "i>",                 ALIAS("i<")                                 },
+	{ "i)",                 ALIAS("i(")                                 },
+	{ "i]",                 ALIAS("i[")                                 },
+	{ "i}",                 ALIAS("i{")                                 },
+	{ "ib",                 ALIAS("i(")                                 },
+	{ "iB",                 ALIAS("i{")                                 },
 	{ "ie",                 ACTION(TEXT_OBJECT_ENTIRE_INNER)            },
 	{ "if",                 ACTION(TEXT_OBJECT_FUNCTION_INNER)          },
 	{ "il",                 ACTION(TEXT_OBJECT_LINE_INNER)              },
+	{ "ip",                 ACTION(TEXT_OBJECT_PARAGRAPH)               },
+	{ "is",                 ACTION(TEXT_OBJECT_SENTENCE)                },
 	{ "i<Tab>",             ACTION(TEXT_OBJECT_INDENTATION)             },
-	{ "a<Tab>",             ACTION(TEXT_OBJECT_INDENTATION)             },
-	{ "gn",                 ACTION(TEXT_OBJECT_SEARCH_FORWARD)          },
-	{ "gN",                 ACTION(TEXT_OBJECT_SEARCH_BACKWARD)         },
+	{ "iW",                 ACTION(TEXT_OBJECT_LONGWORD_INNER)          },
+	{ "iw",                 ACTION(TEXT_OBJECT_WORD_INNER)              },
 	{ 0 /* empty last element, array terminator */                      },
 };
 
@@ -147,22 +147,22 @@ static const KeyBinding bindings_operators[] = {
 	{ "7",                  ACTION(COUNT)                               },
 	{ "8",                  ACTION(COUNT)                               },
 	{ "9",                  ACTION(COUNT)                               },
-	{ "d",                  ACTION(OPERATOR_DELETE)                     },
-	{ "c",                  ACTION(OPERATOR_CHANGE)                     },
-	{ "y",                  ACTION(OPERATOR_YANK)                       },
-	{ ">",                  ACTION(OPERATOR_SHIFT_RIGHT)                },
-	{ "<",                  ACTION(OPERATOR_SHIFT_LEFT)                 },
-	{ "gU",                 ACTION(OPERATOR_CASE_UPPER)                 },
 	{ "~",                  ACTION(OPERATOR_CASE_SWAP)                  },
-	{ "g~",                 ACTION(OPERATOR_CASE_SWAP)                  },
-	{ "gu",                 ACTION(OPERATOR_CASE_LOWER)                 },
 	{ "!",                  ACTION(OPERATOR_FILTER)                     },
 	{ "=",                  ACTION(OPERATOR_FILTER_FMT)                 },
-	{ "p",                  ACTION(PUT_AFTER)                           },
-	{ "P",                  ACTION(PUT_BEFORE)                          },
+	{ "<",                  ACTION(OPERATOR_SHIFT_LEFT)                 },
+	{ ">",                  ACTION(OPERATOR_SHIFT_RIGHT)                },
+	{ "\"",                 ACTION(REGISTER)                            },
+	{ "c",                  ACTION(OPERATOR_CHANGE)                     },
+	{ "d",                  ACTION(OPERATOR_DELETE)                     },
+	{ "g~",                 ACTION(OPERATOR_CASE_SWAP)                  },
 	{ "gp",                 ACTION(PUT_AFTER_END)                       },
 	{ "gP",                 ACTION(PUT_BEFORE_END)                      },
-	{ "\"",                 ACTION(REGISTER)                            },
+	{ "gu",                 ACTION(OPERATOR_CASE_LOWER)                 },
+	{ "gU",                 ACTION(OPERATOR_CASE_UPPER)                 },
+	{ "p",                  ACTION(PUT_AFTER)                           },
+	{ "P",                  ACTION(PUT_BEFORE)                          },
+	{ "y",                  ACTION(OPERATOR_YANK)                       },
 	{ 0 /* empty last element, array terminator */                      },
 };
 
@@ -173,121 +173,121 @@ static const KeyBinding bindings_operator_options[] = {
 };
 
 static const KeyBinding bindings_normal[] = {
-	{ "<Escape>",           ACTION(CURSORS_REMOVE_ALL)                  },
+	{ "a",                  ACTION(APPEND_CHAR_NEXT)                    },
+	{ "A",                  ACTION(APPEND_LINE_END)                     },
+	{ "@",                  ACTION(MACRO_REPLAY)                        },
+	{ ":",                  ACTION(PROMPT_SHOW)                         },
+	{ ".",                  ACTION(REPEAT)                              },
+	{ "~",                  ALIAS("<vis-operator-case-swap>ll")         },
+	{ "<C-a>",              ACTION(NUMBER_INCREMENT)                    },
+	{ "C",                  ALIAS("c$")                                 },
+	{ "<C-b>",              ALIAS("<PageUp>")                           },
 	{ "<C-c>",              ACTION(CURSORS_REMOVE_COLUMN)               },
-	{ "<Delete>",           ALIAS("x")                                  },
-	{ "<C-k>",              ACTION(CURSORS_NEW_LINE_ABOVE)              },
-	{ "<M-C-k>",            ACTION(CURSORS_NEW_LINE_ABOVE_FIRST)        },
+	{ "<C-d>",              ACTION(CURSORS_NEXT)                        },
+	{ "<C-e>",              ACTION(WINDOW_SLIDE_UP)                     },
+	{ "<C-f>",              ALIAS("<PageDown>")                         },
+	{ "<C-i>",              ACTION(JUMPLIST_NEXT)                       },
 	{ "<C-j>",              ACTION(CURSORS_NEW_LINE_BELOW)              },
-	{ "<M-C-j>",            ACTION(CURSORS_NEW_LINE_BELOW_LAST)         },
-	{ "<Tab>",              ACTION(CURSORS_ALIGN)                       },
+	{ "<C-k>",              ACTION(CURSORS_NEW_LINE_ABOVE)              },
+	{ "<C-l>",              ACTION(CURSORS_REMOVE_COLUMN_EXCEPT)        },
 	{ "<C-n>",              ACTION(CURSOR_SELECT_WORD)                  },
+	{ "<C-o>",              ACTION(JUMPLIST_PREV)                       },
 	{ "<C-p>",              ACTION(CURSORS_REMOVE_LAST)                 },
-	{ "<C-w>n",             ALIAS(":open<Enter>")                       },
+	{ "<C-r>",              ACTION(REDO)                                },
+	{ "<C-u>",              ACTION(CURSORS_PREV)                        },
+	{ "<C-w><Backspace>",   ALIAS("<C-w>k")                             },
 	{ "<C-w>c",             ALIAS(":q<Enter>")                          },
-	{ "<C-w>s",             ALIAS(":split<Enter>")                      },
-	{ "<C-w>v",             ALIAS(":vsplit<Enter>")                     },
-	{ "<C-w>j",             ACTION(WINDOW_NEXT)                         },
-	{ "<C-w>l",             ALIAS("<C-w>j")                             },
-	{ "<C-w>w",             ALIAS("<C-w>j")                             },
-	{ "<C-w><C-w>",         ALIAS("<C-w>j")                             },
+	{ "<C-w><C-h>",         ALIAS("<C-w>k")                             },
 	{ "<C-w><C-j>",         ALIAS("<C-w>j")                             },
+	{ "<C-w><C-k>",         ALIAS("<C-w>k")                             },
 	{ "<C-w><C-l>",         ALIAS("<C-w>j")                             },
-	{ "<C-w>k",             ACTION(WINDOW_PREV)                         },
+	{ "<C-w><C-w>",         ALIAS("<C-w>j")                             },
+	{ "<C-w>gf",            ACTION(OPEN_FILE_UNDER_CURSOR_NEW_WINDOW)   },
 	{ "<C-w>h",             ALIAS("<C-w>k")                             },
-	{ "<C-w><C-h>",         ALIAS("<C-w>k")                             },
-	{ "<C-w><C-k>",         ALIAS("<C-w>k")                             },
-	{ "<C-w><Backspace>",   ALIAS("<C-w>k")                             },
-	{ "<C-b>",              ALIAS("<PageUp>")                           },
-	{ "<C-f>",              ALIAS("<PageDown>")                         },
-	{ "<C-u>",              ACTION(CURSORS_PREV)                        },
-	{ "<C-d>",              ACTION(CURSORS_NEXT)                        },
-	{ "<C-e>",              ACTION(WINDOW_SLIDE_UP)                     },
+	{ "<C-w>j",             ACTION(WINDOW_NEXT)                         },
+	{ "<C-w>k",             ACTION(WINDOW_PREV)                         },
+	{ "<C-w>l",             ALIAS("<C-w>j")                             },
+	{ "<C-w>n",             ALIAS(":open<Enter>")                       },
+	{ "<C-w>s",             ALIAS(":split<Enter>")                      },
+	{ "<C-w>v",             ALIAS(":vsplit<Enter>")                     },
+	{ "<C-w>w",             ALIAS("<C-w>j")                             },
+	{ "<C-x>",              ACTION(NUMBER_DECREMENT)                    },
 	{ "<C-y>",              ACTION(WINDOW_SLIDE_DOWN)                   },
-	{ "<C-o>",              ACTION(JUMPLIST_PREV)                       },
-	{ "<C-i>",              ACTION(JUMPLIST_NEXT)                       },
-	{ "g;",                 ACTION(CHANGELIST_PREV)                     },
-	{ "g,",                 ACTION(CHANGELIST_NEXT)                     },
-	{ "a",                  ACTION(APPEND_CHAR_NEXT)                    },
-	{ "A",                  ACTION(APPEND_LINE_END)                     },
-	{ "C",                  ALIAS("c$")                                 },
 	{ "D",                  ALIAS("d$")                                 },
+	{ "<Delete>",           ALIAS("x")                                  },
+	{ "<End>",              ALIAS("$")                                  },
+	{ "<Escape>",           ACTION(CURSORS_REMOVE_ALL)                  },
+	{ "<F1>",               ALIAS(":help<Enter>")                       },
+	{ "ga",                 ACTION(UNICODE_INFO)                        },
+	{ "g,",                 ACTION(CHANGELIST_NEXT)                     },
+	{ "g;",                 ACTION(CHANGELIST_PREV)                     },
+	{ "g-",                 ACTION(EARLIER)                             },
+	{ "g+",                 ACTION(LATER)                               },
+	{ "gf",                 ACTION(OPEN_FILE_UNDER_CURSOR)              },
+	{ "gn",                 ALIAS("vgn")                                },
+	{ "gN",                 ALIAS("vgN")                                },
+	{ "gv",                 ACTION(SELECTION_RESTORE)                   },
 	{ "I",                  ACTION(INSERT_LINE_START)                   },
-	{ ".",                  ACTION(REPEAT)                              },
-	{ "o",                  ACTION(OPEN_LINE_BELOW)                     },
-	{ "O",                  ACTION(OPEN_LINE_ABOVE)                     },
-	{ "J",                  ACTION(JOIN_LINE_BELOW)                     },
-	{ "x",                  ACTION(DELETE_CHAR_NEXT)                    },
-	{ "r",                  ACTION(REPLACE_CHAR)                        },
 	{ "i",                  ACTION(MODE_INSERT)                         },
-	{ "v",                  ACTION(MODE_VISUAL)                         },
-	{ "V",                  ACTION(MODE_VISUAL_LINE)                    },
+	{ "J",                  ACTION(JOIN_LINE_BELOW)                     },
+	{ "m",                  ACTION(MARK_SET)                            },
+	{ "<M-C-j>",            ACTION(CURSORS_NEW_LINE_BELOW_LAST)         },
+	{ "<M-C-k>",            ACTION(CURSORS_NEW_LINE_ABOVE_FIRST)        },
+	{ "O",                  ACTION(OPEN_LINE_ABOVE)                     },
+	{ "o",                  ACTION(OPEN_LINE_BELOW)                     },
+	{ "q",                  ACTION(MACRO_RECORD)                        },
 	{ "R",                  ACTION(MODE_REPLACE)                        },
+	{ "r",                  ACTION(REPLACE_CHAR)                        },
 	{ "S",                  ALIAS("^c$")                                },
 	{ "s",                  ALIAS("cl")                                 },
-	{ "Y",                  ALIAS("y$")                                 },
-	{ "X",                  ALIAS("dh")                                 },
+	{ "<Tab>",              ACTION(CURSORS_ALIGN)                       },
 	{ "u",                  ACTION(UNDO)                                },
-	{ "<C-r>",              ACTION(REDO)                                },
-	{ "g+",                 ACTION(LATER)                               },
-	{ "g-",                 ACTION(EARLIER)                             },
-	{ "<C-l>",              ACTION(CURSORS_REMOVE_COLUMN_EXCEPT)        },
-	{ ":",                  ACTION(PROMPT_SHOW)                         },
-	{ "ZZ",                 ALIAS(":wq<Enter>")                         },
+	{ "v",                  ACTION(MODE_VISUAL)                         },
+	{ "V",                  ACTION(MODE_VISUAL_LINE)                    },
+	{ "x",                  ACTION(DELETE_CHAR_NEXT)                    },
+	{ "X",                  ALIAS("dh")                                 },
+	{ "Y",                  ALIAS("y$")                                 },
+	{ "zb",                 ACTION(WINDOW_REDRAW_BOTTOM)                },
 	{ "ZQ",                 ALIAS(":q!<Enter>")                         },
 	{ "zt",                 ACTION(WINDOW_REDRAW_TOP)                   },
 	{ "zz",                 ACTION(WINDOW_REDRAW_CENTER)                },
-	{ "zb",                 ACTION(WINDOW_REDRAW_BOTTOM)                },
-	{ "q",                  ACTION(MACRO_RECORD)                        },
-	{ "@",                  ACTION(MACRO_REPLAY)                        },
-	{ "gv",                 ACTION(SELECTION_RESTORE)                   },
-	{ "m",                  ACTION(MARK_SET)                            },
-	{ "<F1>",               ALIAS(":help<Enter>")                       },
-	{ "ga",                 ACTION(UNICODE_INFO)                        },
-	{ "~",                  ALIAS("<vis-operator-case-swap>ll")         },
-	{ "<End>",              ALIAS("$")                                  },
-	{ "gf",                 ACTION(OPEN_FILE_UNDER_CURSOR)              },
-	{ "<C-w>gf",            ACTION(OPEN_FILE_UNDER_CURSOR_NEW_WINDOW)   },
-	{ "gn",                 ALIAS("vgn")                                },
-	{ "gN",                 ALIAS("vgN")                                },
-	{ "<C-a>",              ACTION(NUMBER_INCREMENT)                    },
-	{ "<C-x>",              ACTION(NUMBER_DECREMENT)                    },
+	{ "ZZ",                 ALIAS(":wq<Enter>")                         },
 	{ 0 /* empty last element, array terminator */                      },
 };
 
 static const KeyBinding bindings_visual[] = {
-	{ "<C-n>",              ACTION(CURSORS_NEW_MATCH_NEXT)              },
-	{ "<C-x>",              ACTION(CURSORS_NEW_MATCH_SKIP)              },
-	{ "<C-p>",              ACTION(CURSORS_REMOVE_LAST)                 },
-	{ "I",                  ACTION(CURSORS_NEW_LINES_BEGIN)             },
 	{ "A",                  ACTION(CURSORS_NEW_LINES_END)               },
-	{ "<Backspace>",        ALIAS("d")                                  },
-	{ "<C-h>",              ALIAS("<Backspace>")                        },
-	{ "<Delete>",           ALIAS("<Backspace>")                        },
-	{ "<Escape>",           ACTION(MODE_NORMAL)                         },
-	{ "<C-c>",              ACTION(CURSORS_REMOVE_COLUMN)               },
-	{ "<C-l>",              ACTION(CURSORS_REMOVE_COLUMN_EXCEPT)        },
-	{ "v",                  ALIAS("<Escape>")                           },
-	{ "V",                  ACTION(MODE_VISUAL_LINE)                    },
 	{ ":",                  ACTION(PROMPT_SHOW)                         },
+	{ "-",                  ACTION(SELECTIONS_ROTATE_LEFT)              },
+	{ "+",                  ACTION(SELECTIONS_ROTATE_RIGHT)             },
+	{ "\\",                 ACTION(SELECTIONS_TRIM)                     },
+	{ "<",                  ALIAS("<vis-operator-shift-left>gv")        },
+	{ ">",                  ALIAS("<vis-operator-shift-right>gv")       },
+	{ "<Backspace>",        ALIAS("d")                                  },
 	{ "<C-b>",              ALIAS("<PageUp>")                           },
-	{ "<C-f>",              ALIAS("<PageDown>")                         },
-	{ "<C-u>",              ACTION(CURSORS_PREV)                        },
+	{ "<C-c>",              ACTION(CURSORS_REMOVE_COLUMN)               },
 	{ "<C-d>",              ACTION(CURSORS_NEXT)                        },
-	{ "<C-k>",              ALIAS("<C-u>")                              },
+	{ "<C-f>",              ALIAS("<PageDown>")                         },
+	{ "<C-h>",              ALIAS("<Backspace>")                        },
 	{ "<C-j>",              ALIAS("<C-d>")                              },
-	{ "x",                  ALIAS("d")                                  },
-	{ "r",                  ALIAS("c")                                  },
-	{ "s",                  ALIAS("c")                                  },
+	{ "<C-k>",              ALIAS("<C-u>")                              },
+	{ "<C-l>",              ACTION(CURSORS_REMOVE_COLUMN_EXCEPT)        },
+	{ "<C-n>",              ACTION(CURSORS_NEW_MATCH_NEXT)              },
+	{ "<C-p>",              ACTION(CURSORS_REMOVE_LAST)                 },
+	{ "<C-u>",              ACTION(CURSORS_PREV)                        },
+	{ "<C-x>",              ACTION(CURSORS_NEW_MATCH_SKIP)              },
+	{ "<Delete>",           ALIAS("<Backspace>")                        },
+	{ "<Escape>",           ACTION(MODE_NORMAL)                         },
+	{ "I",                  ACTION(CURSORS_NEW_LINES_BEGIN)             },
 	{ "J",                  ACTION(JOIN_LINES)                          },
 	{ "o",                  ACTION(SELECTION_FLIP)                      },
-	{ ">",                  ALIAS("<vis-operator-shift-right>gv")       },
-	{ "<",                  ALIAS("<vis-operator-shift-left>gv")        },
-	{ "<Tab>",              ACTION(CURSORS_ALIGN_INDENT_LEFT)           },
+	{ "r",                  ALIAS("c")                                  },
+	{ "s",                  ALIAS("c")                                  },
 	{ "<S-Tab>",            ACTION(CURSORS_ALIGN_INDENT_RIGHT)          },
-	{ "-",                  ACTION(SELECTIONS_ROTATE_LEFT)              },
-	{ "+",                  ACTION(SELECTIONS_ROTATE_RIGHT)             },
-	{ "\\",                 ACTION(SELECTIONS_TRIM)                     },
+	{ "<Tab>",              ACTION(CURSORS_ALIGN_INDENT_LEFT)           },
+	{ "V",                  ACTION(MODE_VISUAL_LINE)                    },
+	{ "v",                  ALIAS("<Escape>")                           },
+	{ "x",                  ALIAS("d")                                  },
 	{ 0 /* empty last element, array terminator */                      },
 };
 
@@ -299,31 +299,31 @@ static const KeyBinding bindings_visual_line[] = {
 
 static const KeyBinding bindings_readline[] = {
 	{ "<Backspace>",        ACTION(DELETE_CHAR_PREV)                    },
-	{ "<C-h>",              ALIAS("<Backspace>")                        },
-	{ "<Delete>",           ACTION(DELETE_CHAR_NEXT)                    },
-	{ "<Escape>",           ACTION(MODE_NORMAL)                         },
 	{ "<C-c>",              ALIAS("<Escape>")                           },
 	{ "<C-d>",              ACTION(DELETE_CHAR_NEXT)                    },
-	{ "<C-w>",              ACTION(DELETE_WORD_PREV)                    },
+	{ "<C-h>",              ALIAS("<Backspace>")                        },
 	{ "<C-u>",              ACTION(DELETE_LINE_BEGIN)                   },
 	{ "<C-v>",              ACTION(INSERT_VERBATIM)                     },
+	{ "<C-w>",              ACTION(DELETE_WORD_PREV)                    },
+	{ "<Delete>",           ACTION(DELETE_CHAR_NEXT)                    },
+	{ "<Escape>",           ACTION(MODE_NORMAL)                         },
 	{ 0 /* empty last element, array terminator */                      },
 };
 
 static const KeyBinding bindings_insert[] = {
-	{ "<Escape>",           ACTION(MODE_NORMAL)                         },
+	{ "<C-d>",              ALIAS("<Escape><<i")                        },
 	{ "<C-i>",              ALIAS("<Tab>")                              },
-	{ "<Enter>",            ACTION(INSERT_NEWLINE)                      },
 	{ "<C-j>",              ALIAS("<Enter>")                            },
 	{ "<C-m>",              ALIAS("<Enter>")                            },
 	{ "<C-o>",              ACTION(MODE_OPERATOR_PENDING)               },
-	{ "<C-d>",              ALIAS("<Escape><<i")                        },
+	{ "<C-r>",              ACTION(INSERT_REGISTER)                     },
 	{ "<C-t>",              ALIAS("<Escape>>>i")                        },
 	{ "<C-x><C-e>",         ACTION(WINDOW_SLIDE_UP)                     },
 	{ "<C-x><C-y>",         ACTION(WINDOW_SLIDE_DOWN)                   },
-	{ "<Tab>",              ACTION(INSERT_TAB)                          },
+	{ "<Enter>",            ACTION(INSERT_NEWLINE)                      },
+	{ "<Escape>",           ACTION(MODE_NORMAL)                         },
 	{ "<S-Tab>",            ACTION(CURSORS_ALIGN_INDENT_LEFT)           },
-	{ "<C-r>",              ACTION(INSERT_REGISTER)                     },
+	{ "<Tab>",              ACTION(INSERT_TAB)                          },
 	{ 0 /* empty last element, array terminator */                      },
 };