Merge remote-tracking branch 'github/master'

This commit is contained in:
Dave Davenport 2017-03-29 19:49:27 +02:00
commit 290143e0c8
2 changed files with 4 additions and 4 deletions

View file

@ -145,13 +145,13 @@ rofi.kb-delete-entry: Shift+Delete
! "Switch to the next mode." Set from: File
rofi.kb-mode-next: Shift+Right,Control+Tab
! "Switch to the previous mode." Set from: File
rofi.kb-mode-previous: Shift+Left,Control+Shift+Tab
rofi.kb-mode-previous: Shift+Left,Control+ISO_Left_Tab
! "Go to the previous column" Set from: File
rofi.kb-row-left: Control+Page_Up
! "Go to the next column" Set from: File
rofi.kb-row-right: Control+Page_Down
! "Select previous entry" Set from: File
rofi.kb-row-up: Up,Control+p,Shift+Tab
rofi.kb-row-up: Up,Control+p,ISO_Left_Tab
! "Select next entry" Set from: File
rofi.kb-row-down: Down,Control+n
! "Go to next row, if one left, accept it, if no left next mode." Set from: File

View file

@ -57,10 +57,10 @@ DefaultBinding bindings[NUM_ABE] =
{ .id = ACCEPT_ALT, .name = "kb-accept-alt", .keybinding = "Shift+Return", .comment = "Use alternate accept command." },
{ .id = DELETE_ENTRY, .name = "kb-delete-entry", .keybinding = "Shift+Delete", .comment = "Delete entry from history" },
{ .id = MODE_NEXT, .name = "kb-mode-next", .keybinding = "Shift+Right,Control+Tab", .comment = "Switch to the next mode." },
{ .id = MODE_PREVIOUS, .name = "kb-mode-previous", .keybinding = "Shift+Left,Control+Shift+Tab", .comment = "Switch to the previous mode." },
{ .id = MODE_PREVIOUS, .name = "kb-mode-previous", .keybinding = "Shift+Left,Control+ISO_Left_Tab", .comment = "Switch to the previous mode." },
{ .id = ROW_LEFT, .name = "kb-row-left", .keybinding = "Control+Page_Up", .comment = "Go to the previous column" },
{ .id = ROW_RIGHT, .name = "kb-row-right", .keybinding = "Control+Page_Down", .comment = "Go to the next column" },
{ .id = ROW_UP, .name = "kb-row-up", .keybinding = "Up,Control+p,Shift+Tab,Shift+ISO_Left_Tab", .comment = "Select previous entry" },
{ .id = ROW_UP, .name = "kb-row-up", .keybinding = "Up,Control+p,ISO_Left_Tab", .comment = "Select previous entry" },
{ .id = ROW_DOWN, .name = "kb-row-down", .keybinding = "Down,Control+n", .comment = "Select next entry" },
{ .id = ROW_TAB, .name = "kb-row-tab", .keybinding = "Tab", .comment = "Go to next row, if one left, accept it, if no left next mode." },
{ .id = PAGE_PREV, .name = "kb-page-prev", .keybinding = "Page_Up", .comment = "Go to the previous page" },