Merge pull request #8 from gregschlom/master

PogiNate · PogiNate · commit 799ef9d1dcfa · 2015-01-09T16:11:43.000-07:00
Fix wrapped text being incorrectly indented.
diff --git a/Default (Linux).sublime-keymap b/Default (Linux).sublime-keymap
@@ -1,4 +1,4 @@
 [
-  {"keys": ["ctrl+f11"], "command": "wiki_link", "context": [{"key": "selector", "operator": "equal", "operand": "source.Wiki"} ] },
-  {"keys": ["ctrl+enter"], "command": "wiki_link", "context": [{"key": "selector", "operator": "equal", "operand": "source.Wiki"} ] }
+  {"keys": ["ctrl+f11"], "command": "wiki_link", "context": [{"key": "selector", "operator": "equal", "operand": "text.Wiki"} ] },
+  {"keys": ["ctrl+enter"], "command": "wiki_link", "context": [{"key": "selector", "operator": "equal", "operand": "text.Wiki"} ] }
 ]
diff --git a/Default (OSX).sublime-keymap b/Default (OSX).sublime-keymap
@@ -1,4 +1,4 @@
 [
-  {"keys": ["ctrl+f11"], "command": "wiki_link", "context": [{"key": "selector", "operator": "equal", "operand": "source.Wiki"} ] },
-  {"keys": ["ctrl+enter"], "command": "wiki_link", "context": [{"key": "selector", "operator": "equal", "operand": "source.Wiki"} ] }
+  {"keys": ["ctrl+f11"], "command": "wiki_link", "context": [{"key": "selector", "operator": "equal", "operand": "text.Wiki"} ] },
+  {"keys": ["ctrl+enter"], "command": "wiki_link", "context": [{"key": "selector", "operator": "equal", "operand": "text.Wiki"} ] }
 ]
diff --git a/Default (Windows).sublime-keymap b/Default (Windows).sublime-keymap
@@ -1,4 +1,4 @@
 [
-  {"keys": ["ctrl+f11"], "command": "wiki_link", "context": [{"key": "selector", "operator": "equal", "operand": "source.Wiki"} ] },
-  {"keys": ["ctrl+enter"], "command": "wiki_link", "context": [{"key": "selector", "operator": "equal", "operand": "source.Wiki"} ] }
+  {"keys": ["ctrl+f11"], "command": "wiki_link", "context": [{"key": "selector", "operator": "equal", "operand": "text.Wiki"} ] },
+  {"keys": ["ctrl+enter"], "command": "wiki_link", "context": [{"key": "selector", "operator": "equal", "operand": "text.Wiki"} ] }
 ]
diff --git a/Wiki.tmLanguage b/Wiki.tmLanguage
@@ -72,7 +72,7 @@
 		</dict>
 	</array>
 	<key>scopeName</key>
-	<string>source.Wiki</string>
+	<string>text.Wiki</string>
 	<key>uuid</key>
 	<string>14883dd8-b120-4a1e-a4c5-67c5e7815344</string>
 </dict>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`[`
`2`		`- {"keys": ["ctrl+f11"], "command": "wiki_link", "context": [{"key": "selector", "operator": "equal", "operand": "source.Wiki"} ] },`
`3`		`- {"keys": ["ctrl+enter"], "command": "wiki_link", "context": [{"key": "selector", "operator": "equal", "operand": "source.Wiki"} ] }`
	`2`	`+ {"keys": ["ctrl+f11"], "command": "wiki_link", "context": [{"key": "selector", "operator": "equal", "operand": "text.Wiki"} ] },`
	`3`	`+ {"keys": ["ctrl+enter"], "command": "wiki_link", "context": [{"key": "selector", "operator": "equal", "operand": "text.Wiki"} ] }`
`4`	`4`	`]`