Merge remote-tracking branch 'origin/master' into bracketed-paste

This commit is contained in:
dequis 2015-11-08 14:28:18 -03:00
commit 8c98e07eab
23 changed files with 159 additions and 75 deletions

View file

@ -1126,6 +1126,8 @@ void gui_readline_init(void)
key_bind("key", NULL, "meta2-5F", "cend", (SIGNAL_FUNC) key_combo);
key_bind("key", NULL, "meta2-1;5F", "cend", (SIGNAL_FUNC) key_combo);
key_bind("key", NULL, "meta-O-M", "return", (SIGNAL_FUNC) key_combo);
key_bind("paste_start", "Bracketed paste start", "meta2-200~", "paste_start", (SIGNAL_FUNC) key_paste_start);
/* cursor movement */