Skip to content

Commit 9f9bb99

Browse files
committed
Use new keys.assign_platform_bindings().
Requires latest Textadept.
1 parent d9e53e9 commit 9f9bb99

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

init.lua

+10-10
Original file line numberDiff line numberDiff line change
@@ -562,16 +562,16 @@ for i = 1, #m_tools - 1 do
562562
end
563563
end
564564
end
565-
if not CURSES then
566-
keys.f6 = M.start
567-
keys['shift+f6'] = m_tools[_L['Compare Files']][_L['Compare Buffers']][2]
568-
keys[not OSX and 'ctrl+f6' or 'cmd+f6'] = m_tools[_L['Compare Files']][_L['Stop Comparing']][2]
569-
keys[not OSX and 'ctrl+alt+.' or 'ctrl+cmd+.'] =
570-
m_tools[_L['Compare Files']][_L['Next Change']][2]
571-
keys[not OSX and 'ctrl+alt+,' or 'ctrl+cmd+,'] = M.goto_change
572-
keys[not OSX and 'ctrl+alt+<' or 'ctrl+cmd+<'] = m_tools[_L['Compare Files']][_L['Merge Left']][2]
573-
keys[not OSX and 'ctrl+alt+>' or 'ctrl+cmd+>'] = M.merge
574-
end
565+
566+
keys.assign_platform_bindings{
567+
[M.start] = {'f6', 'f6', nil},
568+
[m_tools[_L['Compare Files']][_L['Compare Buffers']][2]] = {'shift+f6', 'shift+f6', nil},
569+
[m_tools[_L['Compare Files']][_L['Stop Comparing']][2]] = {'ctrl+f6', 'cmd+f6', nil},
570+
[m_tools[_L['Compare Files']][_L['Next Change']][2]] = {'ctrl+alt+.', 'ctrl+cmd+.', nil},
571+
[M.goto_change] = {'ctrl+alt+,', 'ctrl+cmd+,', nil},
572+
[m_tools[_L['Compare Files']][_L['Merge Left']][2]] = {'ctrl+alt+<', 'ctrl+cmd+<', nil},
573+
[M.merge] = {'ctrl+alt+>', 'ctrl+cmd+>', nil}
574+
}
575575

576576
return M
577577

0 commit comments

Comments
 (0)