aboutsummaryrefslogtreecommitdiff
path: root/mode-key.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2012-11-22 13:24:14 +0000
committerThomas Adam <thomas@xteddy.org>2012-11-22 13:24:14 +0000
commitc04aa9020782fe0a944db2adf5a03e9f52618bea (patch)
tree37c0578ed65f027e2cbd95671fb3a6ccab4ce547 /mode-key.c
parente4679172e3f4307b14f0e1715dc33ca640dc038b (diff)
parent0679eb6a6d6bab129264784009e70333b34ca6a8 (diff)
downloadrtmux-c04aa9020782fe0a944db2adf5a03e9f52618bea.tar.gz
rtmux-c04aa9020782fe0a944db2adf5a03e9f52618bea.tar.bz2
rtmux-c04aa9020782fe0a944db2adf5a03e9f52618bea.zip
Merge branch 'obsd-master'
Sync from OpenBSD. * obsd-master: Add halfpage commands to mode command string table (missed by accident), from Thomas Adam. Clarify some points about config files, notably that they are only read at server start. From Thomas Adam. Use a utility function for common code to show errors in config file, from Thomas Adam.
Diffstat (limited to 'mode-key.c')
-rw-r--r--mode-key.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/mode-key.c b/mode-key.c
index 6ea2b2f0..7dea26d8 100644
--- a/mode-key.c
+++ b/mode-key.c
@@ -105,6 +105,8 @@ const struct mode_key_cmdstr mode_key_cmdstr_copy[] = {
{ MODEKEYCOPY_DOWN, "cursor-down" },
{ MODEKEYCOPY_ENDOFLINE, "end-of-line" },
{ MODEKEYCOPY_GOTOLINE, "goto-line" },
+ { MODEKEYCOPY_HALFPAGEDOWN, "halfpage-down" },
+ { MODEKEYCOPY_HALFPAGEUP, "halfpage-up" },
{ MODEKEYCOPY_HISTORYBOTTOM, "history-bottom" },
{ MODEKEYCOPY_HISTORYTOP, "history-top" },
{ MODEKEYCOPY_JUMP, "jump-forward" },