Upgrade, Add SFTP, Change theme so we get pretty new one in 2165, Add ZenCoding.

Author: trevormorse

Alignment/Alignment.pyc

@@ -1,6 +1,7 @@
 {
 	"font_face": "Menlo Regular",
-	"font_size": 11,
+	"font_size": 12,
 	"scroll_past_end": false,
-	"find_selected_text": false
+	"find_selected_text": false,
+	"move_to_limit_on_up_down": true
 }

Default/Base File (OSX).sublime-settings

@@ -27,6 +27,12 @@
 	// Set to false to hide the gutter altogether
 	"gutter": true,
 
+	// Fold buttons are the triangles shown in the gutter to fold regions of text
+	"fold_buttons": true,
+
+	// Hides the fold buttons unless the mouse is over the gutter
+	"fade_fold_buttons": true,
+
 	// Columns in which to display vertical rulers
 	"rulers": [],
 
@@ -119,6 +125,12 @@
 	// you'll need to place this line in your user settings to override it.
 	"scroll_past_end": true,
 
+	// This controls what happens when pressing up or down when on the first
+	// or last line.
+	// On OS X, this value is overridden in the platform specific settings, so
+	// you'll need to place this line in your user settings to override it.
+	"move_to_limit_on_up_down": false,
+
 	// Set to "none" to turn off drawing white space, "selection" to draw only the
 	// white space within the selection, and "all" to draw all white space
 	"draw_white_space": "selection",
@@ -130,10 +142,9 @@
 	"draw_indent_guides": true,
 
 	// Controls how the indent guides are drawn, valid options are
-	// "draw_normal", "draw_active", "draw_stack" and "normal_stippled",
-	// "active_stippled" and "stack_stippled"
-	"indent_guide_options": ["draw_normal", "draw_active", "draw_stack",
-		"normal_stippled", "stack_stippled", "active_stippled"],
+	// "draw_normal" and "draw_active". draw_active will draw the indent
+	// guides containing the caret in a different color.
+	"indent_guide_options": ["draw_normal"],
 
 	// Set to true to removing trailing white space on save
 	"trim_trailing_white_space_on_save": false,
@@ -150,6 +161,13 @@
 	// ASCII, UTF-8 and UTF-16 encodings will be automatically detected.
 	"fallback_encoding": "Western (Windows 1252)",
 
+	// Encoding used when saving new files, and files opened with an undefined
+	// encoding (e.g., plain ascii files). If a file is opened with a specific
+	// encoding (either detected or given explicitly), this setting will be
+	// ignored, and the file will be saved with the encoding it was opened
+	// with.
+	"default_encoding": "UTF-8",
+
 	// Determines what character(s) are used to terminate each line in new files.
 	// Valid values are 'system' (whatever the OS uses), 'windows' (CRLF) and
 	// 'unix' (LF only).
@@ -161,6 +179,31 @@
 	// enabled.
 	"tab_completion": true,
 
+	// Enable auto complete to be triggered automatically when typing.
+	"auto_complete": true,
+
+	// The maximum file size where auto complete will be automatically triggered.
+	"auto_complete_size_limit": 4194304,
+
+	// The delay, in ms, before the auto complete window is shown after typing
+	"auto_complete_delay": 50,
+
+	// Controls what scopes auto complete will be triggered in
+	"auto_complete_selector": "source - comment",
+
+	// Additional situations to trigger auto complete
+	"auto_complete_triggers": [ {"selector": "text.html", "characters": "<"} ],
+
+	// By default, auto complete will commit the current completion on enter.
+	// This setting can be used to make it complete on tab instead.
+	// Completing on tab is generally a superior option, as it removes
+	// ambiguity between committing the completion and inserting a newline.
+	"auto_complete_commit_on_tab": false,
+
+	// Controls if auto complete is shown when snippet fields are active.
+	// Only relevant if auto_complete_commit_on_tab is true.
+	"auto_complete_with_fields": false,
+
 	// By default, shift+tab will only unindent if the selection spans
 	// multiple lines. When pressing shift+tab at other times, it'll insert a
 	// tab character - this allows tabs to be inserted when tab_completion is
@@ -170,5 +213,7 @@
 
 	// If true, the selected text will be copied into the find panel when it's
 	// shown.
+	// On OS X, this value is overridden in the platform specific settings, so
+	// you'll need to place this line in your user settings to override it.
 	"find_selected_text": true
 }

Default/Base File.sublime-settings

@@ -4,6 +4,7 @@
 	{ "keys": ["ctrl+shift+n"], "command": "new_window" },
 	{ "keys": ["ctrl+shift+w"], "command": "close_window" },
 	{ "keys": ["ctrl+o"], "command": "prompt_open_file" },
+	{ "keys": ["ctrl+shift+t"], "command": "reopen_last_file" },
 	{ "keys": ["alt+o"], "command": "switch_file", "args": {"extensions": ["cpp", "cxx", "cc", "c", "hpp", "hxx", "h", "ipp", "inl", "m", "mm"]} },
 	{ "keys": ["ctrl+n"], "command": "new_file" },
 	{ "keys": ["ctrl+s"], "command": "save" },
@@ -30,13 +31,13 @@
 	{ "keys": ["ctrl+u"], "command": "soft_undo" },
 	{ "keys": ["ctrl+shift+u"], "command": "soft_redo" },
 
+	{ "keys": ["shift+delete"], "command": "cut" },
+	{ "keys": ["ctrl+insert"], "command": "copy" },
+	{ "keys": ["shift+insert"], "command": "paste" },
 	{ "keys": ["ctrl+x"], "command": "cut" },
 	{ "keys": ["ctrl+c"], "command": "copy" },
 	{ "keys": ["ctrl+v"], "command": "paste" },
 	{ "keys": ["ctrl+shift+v"], "command": "paste_and_indent" },
-	{ "keys": ["shift+delete"], "command": "cut" },
-	{ "keys": ["ctrl+insert"], "command": "copy" },
-	{ "keys": ["shift+insert"], "command": "paste" },
 
 	{ "keys": ["left"], "command": "move", "args": {"by": "characters", "forward": false} },
 	{ "keys": ["right"], "command": "move", "args": {"by": "characters", "forward": true} },
@@ -123,6 +124,12 @@
 			{ "key": "setting.tab_completion", "operator": "equal", "operand": true }
 		]
 	},
+	{ "keys": ["tab"], "command": "replace_completion_with_next_completion", "context":
+		[
+			{ "key": "last_command", "operator": "equal", "operand": "insert_best_completion" },
+			{ "key": "setting.tab_completion", "operator": "equal", "operand": true }
+		]
+	},
 	{ "keys": ["tab"], "command": "reindent", "context":
 		[
 			{ "key": "setting.auto_indent", "operator": "equal", "operand": true },
@@ -141,6 +148,12 @@
 			{ "key": "has_next_field", "operator": "equal", "operand": true }
 		]
 	},
+	{ "keys": ["tab"], "command": "commit_completion", "context":
+		[
+			{ "key": "auto_complete_visible" },
+			{ "key": "setting.auto_complete_commit_on_tab" }
+		]
+	},
 
 	{ "keys": ["shift+tab"], "command": "insert", "args": {"characters": "\t"} },
 	{ "keys": ["shift+tab"], "command": "unindent", "context":
@@ -170,12 +183,7 @@
 	{ "keys": ["insert"], "command": "toggle_overwrite" },
 
 	{ "keys": ["ctrl+l"], "command": "expand_selection", "args": {"to": "line"} },
-	{ "keys": ["ctrl+d"], "command": "expand_selection", "args": {"to": "word"} },
-	{ "keys": ["ctrl+d"], "command": "find_under_expand", "context":
-		[
-			{ "key": "selection_empty", "operator": "equal", "operand": false, "match_all": true }
-		]
-	},
+	{ "keys": ["ctrl+d"], "command": "find_under_expand" },
 	{ "keys": ["ctrl+shift+space"], "command": "expand_selection", "args": {"to": "scope"} },
 	{ "keys": ["ctrl+shift+m"], "command": "expand_selection", "args": {"to": "brackets"} },
 	{ "keys": ["ctrl+m"], "command": "move_to", "args": {"to": "brackets"} },
@@ -189,6 +197,12 @@
 
 	{ "keys": ["ctrl+enter"], "command": "run_macro_file", "args": {"file": "Packages/Default/Add Line.sublime-macro"} },
 	{ "keys": ["ctrl+shift+enter"], "command": "run_macro_file", "args": {"file": "Packages/Default/Add Line Before.sublime-macro"} },
+	{ "keys": ["enter"], "command": "commit_completion", "context":
+		[
+			{ "key": "auto_complete_visible" },
+			{ "key": "setting.auto_complete_commit_on_tab", "operand": false }
+		]
+	},
 
 	{ "keys": ["ctrl+p"], "command": "show_overlay", "args": {"overlay": "goto", "show_files": true} },
 	{ "keys": ["ctrl+shift+p"], "command": "show_overlay", "args": {"overlay": "command_palette"} },
@@ -201,6 +215,7 @@
 	{ "keys": ["ctrl+shift+i"], "command": "show_panel", "args": {"panel": "incremental_find", "reverse":true} },
 	{ "keys": ["ctrl+f"], "command": "show_panel", "args": {"panel": "find"} },
 	{ "keys": ["ctrl+h"], "command": "show_panel", "args": {"panel": "replace"} },
+	{ "keys": ["ctrl+shift+h"], "command": "replace_next" },
 	{ "keys": ["f3"], "command": "find_next" },
 	{ "keys": ["shift+f3"], "command": "find_prev" },
 	{ "keys": ["ctrl+f3"], "command": "find_under" },
@@ -228,20 +243,21 @@
 	{ "keys": ["ctrl+j"], "command": "join_lines" },
 	{ "keys": ["ctrl+shift+d"], "command": "duplicate_line" },
 
-	{ "keys": ["ctrl+`"], "command": "show_panel", "args": {"panel": "console"} },
+	{ "keys": ["ctrl+`"], "command": "show_panel", "args": {"panel": "console", "toggle": true} },
 
 	{ "keys": ["ctrl+space"], "command": "auto_complete" },
 	{ "keys": ["ctrl+space"], "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": ["ctrl+alt+shift+p"], "command": "show_scope_name" },
 
-	{ "keys": ["ctrl+b"], "command": "build" },
 	{ "keys": ["f7"], "command": "build" },
+	{ "keys": ["ctrl+b"], "command": "build" },
 	{ "keys": ["ctrl+break"], "command": "exec", "args": {"kill": true} },
 
 	{ "keys": ["ctrl+t"], "command": "transpose" },
@@ -501,6 +517,7 @@
 	{ "keys": ["ctrl+shift+2"], "command": "move_to_group", "args": { "group": 1 } },
 	{ "keys": ["ctrl+shift+3"], "command": "move_to_group", "args": { "group": 2 } },
 	{ "keys": ["ctrl+shift+4"], "command": "move_to_group", "args": { "group": 3 } },
+	{ "keys": ["ctrl+0"], "command": "focus_side_bar" },
 
 	{ "keys": ["alt+1"], "command": "select_by_index", "args": { "index": 0 } },
 	{ "keys": ["alt+2"], "command": "select_by_index", "args": { "index": 1 } },

Default/Default (Linux).sublime-keymap

@@ -90,5 +90,9 @@
 	{ "button": "button4", "modifiers": [], "command": "prev_view" },
 	{ "button": "button5", "modifiers": [], "command": "next_view" },
 
+	// Change font size with ctrl+scroll wheel
+	{ "button": "scroll_down", "modifiers": ["ctrl"], "command": "decrease_font_size" },
+	{ "button": "scroll_up", "modifiers": ["ctrl"], "command": "increase_font_size" },
+
 	{ "button": "button2", "modifiers": [], "press_command": "context_menu" }
 ]

Default/Default (Linux).sublime-mousemap

@@ -6,6 +6,7 @@ and don't need to be repeated here. Anything listed here will take precedence, h
 	{ "keys": ["super+shift+n"], "command": "new_window" },
 	{ "keys": ["super+shift+w"], "command": "close_window" },
 	{ "keys": ["super+o"], "command": "prompt_open_file" },
+	{ "keys": ["super+shift+t"], "command": "reopen_last_file" },
 	{ "keys": ["super+alt+up"], "command": "switch_file", "args": {"extensions": ["cpp", "cxx", "cc", "c", "hpp", "hxx", "h", "ipp", "inl", "m", "mm"]} },
 	{ "keys": ["super+n"], "command": "new_file" },
 	{ "keys": ["super+s"], "command": "save" },
@@ -90,6 +91,12 @@ and don't need to be repeated here. Anything listed here will take precedence, h
 			{ "key": "setting.tab_completion", "operator": "equal", "operand": true }
 		]
 	},
+	{ "keys": ["tab"], "command": "replace_completion_with_next_completion", "context":
+		[
+			{ "key": "last_command", "operator": "equal", "operand": "insert_best_completion" },
+			{ "key": "setting.tab_completion", "operator": "equal", "operand": true }
+		]
+	},
 	{ "keys": ["tab"], "command": "reindent", "context":
 		[
 			{ "key": "setting.auto_indent", "operator": "equal", "operand": true },
@@ -108,6 +115,12 @@ and don't need to be repeated here. Anything listed here will take precedence, h
 			{ "key": "has_next_field", "operator": "equal", "operand": true }
 		]
 	},
+	{ "keys": ["tab"], "command": "commit_completion", "context":
+		[
+			{ "key": "auto_complete_visible" },
+			{ "key": "setting.auto_complete_commit_on_tab" }
+		]
+	},
 
 	{ "keys": ["shift+tab"], "command": "insert", "args": {"characters": "\t"} },
 	{ "keys": ["shift+tab"], "command": "unindent", "context":
@@ -132,12 +145,7 @@ and don't need to be repeated here. Anything listed here will take precedence, h
 	},
 
 	{ "keys": ["super+l"], "command": "expand_selection", "args": {"to": "line"} },
-	{ "keys": ["super+d"], "command": "expand_selection", "args": {"to": "word"} },
-	{ "keys": ["super+d"], "command": "find_under_expand", "context":
-		[
-			{ "key": "selection_empty", "operator": "equal", "operand": false, "match_all": true }
-		]
-	},
+	{ "keys": ["super+d"], "command": "find_under_expand" },
 	{ "keys": ["super+shift+space"], "command": "expand_selection", "args": {"to": "scope"} },
 	{ "keys": ["ctrl+shift+m"], "command": "expand_selection", "args": {"to": "brackets"} },
 	{ "keys": ["ctrl+m"], "command": "move_to", "args": {"to": "brackets"} },
@@ -151,9 +159,15 @@ and don't need to be repeated here. Anything listed here will take precedence, h
 
 	{ "keys": ["super+enter"], "command": "run_macro_file", "args": {"file": "Packages/Default/Add Line.sublime-macro"} },
 	{ "keys": ["super+shift+enter"], "command": "run_macro_file", "args": {"file": "Packages/Default/Add Line Before.sublime-macro"} },
+	{ "keys": ["enter"], "command": "commit_completion", "context":
+		[
+			{ "key": "auto_complete_visible" },
+			{ "key": "setting.auto_complete_commit_on_tab", "operand": false }
+		]
+	},
 
-	{ "keys": ["super+p"], "command": "show_overlay", "args": {"overlay": "goto", "show_files": true} },
 	{ "keys": ["super+t"], "command": "show_overlay", "args": {"overlay": "goto", "show_files": true} },
+	{ "keys": ["super+p"], "command": "show_overlay", "args": {"overlay": "goto", "show_files": true} },
 	{ "keys": ["super+shift+p"], "command": "show_overlay", "args": {"overlay": "command_palette"} },
 	{ "keys": ["super+ctrl+p"], "command": "prompt_select_project" },
 	{ "keys": ["super+r"], "command": "show_overlay", "args": {"overlay": "goto", "text": "@"} },
@@ -163,6 +177,7 @@ and don't need to be repeated here. Anything listed here will take precedence, h
 	{ "keys": ["super+shift+i"], "command": "show_panel", "args": {"panel": "incremental_find", "reverse":true} },
 	{ "keys": ["super+f"], "command": "show_panel", "args": {"panel": "find"} },
 	{ "keys": ["super+alt+f"], "command": "show_panel", "args": {"panel": "replace"} },
+	{ "keys": ["super+alt+e"], "command": "replace_next" },
 	{ "keys": ["super+g"], "command": "find_next" },
 	{ "keys": ["super+shift+g"], "command": "find_prev" },
 	{ "keys": ["super+e"], "command": "slurp_find_string" },
@@ -192,21 +207,22 @@ and don't need to be repeated here. Anything listed here will take precedence, h
 	{ "keys": ["super+j"], "command": "join_lines" },
 	{ "keys": ["super+shift+d"], "command": "duplicate_line" },
 
-	{ "keys": ["ctrl+backquote"], "command": "show_panel", "args": {"panel": "console"} },
+	{ "keys": ["ctrl+backquote"], "command": "show_panel", "args": {"panel": "console", "toggle": true} },
 
 	{ "keys": ["ctrl+space"], "command": "auto_complete" },
 	{ "keys": ["ctrl+space"], "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": ["super+alt+p"], "command": "show_scope_name" },
 	{ "keys": ["ctrl+shift+p"], "command": "show_scope_name" },
 
-	{ "keys": ["super+b"], "command": "build" },
 	{ "keys": ["f7"], "command": "build" },
+	{ "keys": ["super+b"], "command": "build" },
 
 	{ "keys": ["ctrl+t"], "command": "transpose" },
 
@@ -465,6 +481,7 @@ and don't need to be repeated here. Anything listed here will take precedence, h
 	{ "keys": ["ctrl+shift+2"], "command": "move_to_group", "args": { "group": 1 } },
 	{ "keys": ["ctrl+shift+3"], "command": "move_to_group", "args": { "group": 2 } },
 	{ "keys": ["ctrl+shift+4"], "command": "move_to_group", "args": { "group": 3 } },
+	{ "keys": ["ctrl+0"], "command": "focus_side_bar" },
 
 	{ "keys": ["super+1"], "command": "select_by_index", "args": { "index": 0 } },
 	{ "keys": ["super+2"], "command": "select_by_index", "args": { "index": 1 } },
@@ -579,18 +596,20 @@ and don't need to be repeated here. Anything listed here will take precedence, h
 
 	{ "keys": ["super+,"], "command": "open_file", "args": {"file": "${packages}/User/Base File.sublime-settings"} },
 
-	// These are OS X builtin commands, and don't need to be listed here, but
+	{ "keys": ["super+k", "super+y"], "command": "yank" },
+	{ "keys": ["super+k", "super+k"], "command": "run_macro_file", "args": {"file": "Packages/Default/Delete to Hard EOL.sublime-macro"} },
+	{ "keys": ["super+k", "super+backspace"], "command": "run_macro_file", "args": {"file": "Packages/Default/Delete to Hard BOL.sublime-macro"} },
+	{ "keys": ["super+k", "super+c"], "command": "show_at_center" },
+
+	// These are OS X built in commands, and don't need to be listed here, but
 	// doing so lets them show up in the menu
 	{ "keys": ["ctrl+y"], "command": "yank" },
-	{ "keys": ["ctrl+k"], "command": "run_macro_file", "args": {"file": "Packages/Default/Delete to Hard EOL.sublime-macro"} },
 	{ "keys": ["super+backspace"], "command": "run_macro_file", "args": {"file": "Packages/Default/Delete to Hard BOL.sublime-macro"} },
+	// super+delete isn't a built in command, but makes sense anyway
+	{ "keys": ["super+delete"], "command": "run_macro_file", "args": {"file": "Packages/Default/Delete to Hard EOL.sublime-macro"} },
+	{ "keys": ["ctrl+k"], "command": "run_macro_file", "args": {"file": "Packages/Default/Delete to Hard EOL.sublime-macro"} },
 	{ "keys": ["ctrl+l"], "command": "show_at_center" },
 	{ "keys": ["ctrl+o"], "command": "insert_snippet", "args": { "contents": "$0\n" } },
 	{ "keys": ["ctrl+super+d"], "command": "noop" },
-	{ "keys": ["ctrl+super+shift+d"], "command": "noop" },
-
-	{ "keys": ["super+k", "super+y"], "command": "yank" },
-	{ "keys": ["super+k", "super+k"], "command": "run_macro_file", "args": {"file": "Packages/Default/Delete to Hard EOL.sublime-macro"} },
-	{ "keys": ["super+k", "super+backspace"], "command": "run_macro_file", "args": {"file": "Packages/Default/Delete to Hard BOL.sublime-macro"} },
-	{ "keys": ["super+k", "super+c"], "command": "show_at_center" }
+	{ "keys": ["ctrl+super+shift+d"], "command": "noop" }
 ]