Permalink
Browse files

Merge remote-tracking branch 'hobbs/master'

Conflicts:
	Default (Linux).sublime-keymap
	Default (Windows).sublime-keymap
  • Loading branch information...
2 parents 2f1af9e + 4387b39 commit b0f307b6375a74bbd655f7a72f7b206141f96c07 @grundprinzip grundprinzip committed Jul 19, 2012
Showing with 82 additions and 28 deletions.
  1. +1 −0 .gitignore
  2. +18 −1 Default (Linux).sublime-keymap
  3. +45 −26 Default (OSX).sublime-keymap
  4. +18 −1 Default (Windows).sublime-keymap
View
@@ -1,2 +1,3 @@
.DS_Store
*.sublime-*
+*.pyc
@@ -64,6 +64,21 @@
{ "key": "sbp_emacs_has_mark", "operator": "equal", "operand": true }
]
},
+ { "keys": ["ctrl+n"], "command": "move", "args": {"by": "lines", "forward": true, "extend": true}, "context":
+ [
+ { "key": "sbp_emacs_has_mark", "operator": "equal", "operand": true }
+ ]
+ },
+ { "keys": ["ctrl+p"], "command": "move", "args": {"by": "lines", "forward": false, "extend": true}, "context":
+ [
+ { "key": "sbp_emacs_has_mark", "operator": "equal", "operand": true }
+ ]
+ },
+ { "keys": ["ctrl+space"], "command": "sbp_cancel_mark", "context" :
+ [
+ { "key": "sbp_emacs_has_mark", "operator": "equal", "operand": true }
+ ]
+ },
// Search and Replace
{ "keys": ["ctrl+r"], "command": "show_panel", "args": {"panel": "incremental_find", "reverse":true} },
{ "keys": ["ctrl+s"], "command": "show_panel", "args": {"panel": "incremental_find", "reverse":false} },
@@ -119,6 +134,8 @@
{ "keys": ["ctrl+x", "ctrl+c"], "command": "exit"},
{ "keys": ["ctrl+x", "ctrl+s"], "command": "save"},
- { "keys": ["alt+x", "f", "f", "a", "p"], "command": "sbp_find_file_at_point" }
+ { "keys": ["alt+x", "f", "f", "a", "p"], "command": "sbp_find_file_at_point" },
+ // Emacs style tabs
+ { "keys": ["tab"], "command": "reindent"}
]
@@ -1,9 +1,9 @@
[
- { "keys": ["alt+q"], "command": "wrap_lines" },
- { "keys": ["ctrl+o"], "command": "sbp_open_line" },
+ { "keys": ["alt+q"], "command": "wrap_lines" },
+ { "keys": ["ctrl+o"], "command": "sbp_open_line" },
- // Emacs style
- { "keys": ["ctrl+a"], "command": "move_to", "args": {"to": "bol", "extend": false} },
+ // Emacs style
+ { "keys": ["ctrl+a"], "command": "move_to", "args": {"to": "bol", "extend": false} },
{ "keys": ["ctrl+e"], "command": "move_to", "args": {"to": "eol", "extend": false} },
{ "keys": ["alt+v"], "command": "move", "args": {"by": "pages", "forward": false} },
{ "keys": ["ctrl+v"], "command": "move", "args": {"by": "pages", "forward": true} },
@@ -52,7 +52,7 @@
},
{ "keys": ["ctrl+b"], "command": "move", "args": {"by": "characters", "forward": false, "extend": true}, "context":
[
- { "key": "sbp_emacs_has_mark", "operator": "equal", "operand": true }
+ { "key": "sbp_emacs_has_mark", "operator": "equal", "operand": true }
]
},
{ "keys": ["alt+b"], "command": "move", "args": {"by": "words", "forward": false, "extend": true}, "context":
@@ -67,6 +67,22 @@
]
},
+ { "keys": ["ctrl+n"], "command": "move", "args": {"by": "lines", "forward": true, "extend": true}, "context":
+ [
+ { "key": "sbp_emacs_has_mark", "operator": "equal", "operand": true }
+ ]
+ },
+ { "keys": ["ctrl+p"], "command": "move", "args": {"by": "lines", "forward": false, "extend": true}, "context":
+ [
+ { "key": "sbp_emacs_has_mark", "operator": "equal", "operand": true }
+ ]
+ },
+ { "keys": ["ctrl+space"], "command": "sbp_cancel_mark", "context" :
+ [
+ { "key": "sbp_emacs_has_mark", "operator": "equal", "operand": true }
+ ]
+ },
+
// Search and Replace
{ "keys": ["ctrl+r"], "command": "show_panel", "args": {"panel": "incremental_find", "reverse":true} },
{ "keys": ["ctrl+s"], "command": "show_panel", "args": {"panel": "incremental_find", "reverse":false} },
@@ -81,30 +97,30 @@
// Completion
{ "keys": ["alt+/"], "command": "auto_complete" },
- { "keys": ["alt+/"], "command": "replace_completion_with_auto_complete", "context":
- [
- { "key": "last_command", "operator": "equal", "operand": "insert_best_completion" },
- { "key": "auto_complete_visible", "operator": "equal", "operand": false },
- { "key": "setting.tab_completion", "operator": "equal", "operand": true }
- ]
- },
+ { "keys": ["alt+/"], "command": "replace_completion_with_auto_complete", "context":
+ [
+ { "key": "last_command", "operator": "equal", "operand": "insert_best_completion" },
+ { "key": "auto_complete_visible", "operator": "equal", "operand": false },
+ { "key": "setting.tab_completion", "operator": "equal", "operand": true }
+ ]
+ },
// Aborter
{ "keys": ["ctrl+g"], "command": "hide_overlay", "context":
- [
- { "key": "overlay_visible", "operator": "equal", "operand": true }
- ]
- },
+ [
+ { "key": "overlay_visible", "operator": "equal", "operand": true }
+ ]
+ },
{ "keys": ["ctrl+g"], "command": "hide_auto_complete", "context":
- [
- { "key": "auto_complete_visible", "operator": "equal", "operand": true }
- ]
- },
- { "keys": ["ctrl+g"], "command": "hide_panel", "context":
- [
- { "key": "panel_visible", "operator": "equal", "operand": true }
- ]
- },
+ [
+ { "key": "auto_complete_visible", "operator": "equal", "operand": true }
+ ]
+ },
+ { "keys": ["ctrl+g"], "command": "hide_panel", "context":
+ [
+ { "key": "panel_visible", "operator": "equal", "operand": true }
+ ]
+ },
{ "keys": ["alt+;"], "command": "toggle_comment" },
@@ -122,5 +138,8 @@
{ "keys": ["ctrl+x", "ctrl+s"], "command": "save"},
// Other Emacs features
- { "keys": ["alt+x", "f", "f", "a", "p"], "command": "sbp_find_file_at_point" }
+ { "keys": ["alt+x", "f", "f", "a", "p"], "command": "sbp_find_file_at_point" },
+
+ // Emacs style tabs
+ { "keys": ["tab"], "command": "reindent"}
]
@@ -64,6 +64,21 @@
{ "key": "sbp_emacs_has_mark", "operator": "equal", "operand": true }
]
},
+ { "keys": ["ctrl+n"], "command": "move", "args": {"by": "lines", "forward": true, "extend": true}, "context":
+ [
+ { "key": "sbp_emacs_has_mark", "operator": "equal", "operand": true }
+ ]
+ },
+ { "keys": ["ctrl+p"], "command": "move", "args": {"by": "lines", "forward": false, "extend": true}, "context":
+ [
+ { "key": "sbp_emacs_has_mark", "operator": "equal", "operand": true }
+ ]
+ },
+ { "keys": ["ctrl+space"], "command": "sbp_cancel_mark", "context" :
+ [
+ { "key": "sbp_emacs_has_mark", "operator": "equal", "operand": true }
+ ]
+ },
// Search and Replace
{ "keys": ["ctrl+r"], "command": "show_panel", "args": {"panel": "incremental_find", "reverse":true} },
@@ -120,6 +135,8 @@
{ "keys": ["ctrl+x", "ctrl+c"], "command": "exit"},
{ "keys": ["ctrl+x", "ctrl+s"], "command": "save"},
- { "keys": ["alt+x", "f", "f", "a", "p"], "command": "sbp_find_file_at_point" }
+ { "keys": ["alt+x", "f", "f", "a", "p"], "command": "sbp_find_file_at_point" },
+ // Emacs style tabs
+ { "keys": ["tab"], "command": "reindent"}
]

0 comments on commit b0f307b

Please sign in to comment.