Merge branch 'upstream'

This commit is contained in:
Jonathan Hodgson 2019-09-08 09:54:55 +01:00
commit 50582b4c92

View file

@ -197,10 +197,6 @@ static Shortcut shortcuts[] = {
* * 0: no value
* * > 0: cursor application mode enabled
* * < 0: cursor application mode disabled
* crlf value
* * 0: no value
* * > 0: crlf mode is enabled
* * < 0: crlf mode is disabled
*
* Be careful with the order of the definitions because st searches in
* this table sequentially, so any XK_ANY_MOD must be in the last