Merge branch 'master' into define

Conflicts:
	lib/ace/RenderLoop.js
This commit is contained in:
Fabian Jakobs 2010-11-09 08:54:34 +01:00
commit bb1fe29944
8 changed files with 136 additions and 40 deletions

View file

@ -52,26 +52,26 @@ return {
"overwrite": "Insert",
"copylinesup": "Ctrl-Alt-Up",
"movelinesup": "Alt-Up",
"selecttostart": "Ctrl-Shift-Up",
"selecttostart": "Alt-Shift-Up",
"gotostart": "Ctrl-Home|Ctrl-Up",
"selectup": "Shift-Up",
"golineup": "Up",
"copylinesdown": "Ctrl-Alt-Down",
"movelinesdown": "Alt-Down",
"selecttoend": "Ctrl-Shift-Down",
"selecttoend": "Alt-Shift-Down",
"gotoend": "Ctrl-End|Ctrl-Down",
"selectdown": "Shift-Down",
"godown": "Down",
"selectwordleft": "Alt-Shift-Left",
"gotowordleft": "Alt-Left",
"selectwordleft": "Ctrl-Shift-Left",
"gotowordleft": "Ctrl-Left",
"selecttolinestart": "Ctrl-Shift-Left",
"gotolinestart": "Ctrl-Left|Home",
"gotolinestart": "Alt-Left|Home",
"selectleft": "Shift-Left",
"gotoleft": "Left",
"selectwordright": "Alt-Shift-Right",
"gotowordright": "Alt-Right",
"selectwordright": "Ctrl-Shift-Right",
"gotowordright": "Ctrl-Right",
"selecttolineend": "Ctrl-Shift-Right",
"gotolineend": "Ctrl-Right|End",
"gotolineend": "Alt-Right|End",
"selectright": "Shift-Right",
"gotoright": "Right",
"selectpagedown": "Shift-PageDown",