Merge branch 'master' into only

Author: deadpixi

config.def.h

@@ -58,6 +58,9 @@
 #define DELETE_NODE KEY(L'w')
 #define ONLY_NODE KEY(L'q')
 
+/* does nothing, specifically */
+#define BAILOUT KEY(L'c')
+
 /* The force redraw key. */
 #define REDRAW KEY(L'l')
 

mtm.1

@@ -74,6 +74,8 @@ when prefixed with the command character:
 .Bl -tag -width Ds
 .It Em "Up/Down/Right/Left Arrow"
 Select the terminal above/below/to the right of/to the left of the currently focused one.
+.It Em "c"
+Abandon the keychord sequence.
 .It Em "o"
 .Pq "the letter oh"
 Switch to the last-focused terminal.

mtm.c

@@ -1122,6 +1122,7 @@ handlechar(int r, int k) /* Handle a single input character. */
     DO(true,  VSPLIT,              split(n, VERTICAL))
     DO(true,  DELETE_NODE,         deletenode(n))
     DO(true,  ONLY_NODE,           onlynode(n))
+    DO(true,  BAILOUT,             (void)1)
     DO(true,  REDRAW,              touchwin(stdscr); draw(root); redrawwin(stdscr))
     DO(true,  SCROLLUP,            scrollback(n))
     DO(true,  SCROLLDOWN,          scrollforward(n))