Merge remote-tracking branch 'rxi/master' into agg-font-renderer

data/core/doc/init.lua

@@ -56,7 +56,8 @@ end
 
 
 function Doc:reset_syntax()
-  local syn = syntax.get(self.filename or "")
+  local header = self:get_text(1, 1, self:position_offset(1, 1, 128))
+  local syn = syntax.get(self.filename or "", header)
   if self.syntax ~= syn then
     self.syntax = syn
     self.highlighter:reset()

data/core/syntax.lua

@@ -11,14 +11,19 @@ function syntax.add(t)
 end
 
 
-function syntax.get(filename)
+local function find(string, field)
   for i = #syntax.items, 1, -1 do
     local t = syntax.items[i]
-    if common.match_pattern(filename, t.files) then
+    if common.match_pattern(string, t[field] or {}) then
       return t
     end
   end
-  return plain_text_syntax
+end
+
+function syntax.get(filename, header)
+  return find(filename, "files")
+      or find(header, "headers")
+      or plain_text_syntax
 end
 
 

data/plugins/language_lua.lua

@@ -2,6 +2,7 @@ local syntax = require "core.syntax"
 
 syntax.add {
   files = "%.lua$",
+  headers = "^#!.*[ /]lua",
   comment = "--",
   patterns = {
     { pattern = { '"', '"', '\\' },       type = "string"   },

data/plugins/language_python.lua

@@ -2,6 +2,7 @@ local syntax = require "core.syntax"
 
 syntax.add {
   files = "%.py$",
+  headers = "^#!.*[ /]python",
   comment = "#",
   patterns = {
     { pattern = { "#", "\n" },            type = "comment"  },

data/plugins/language_xml.lua

@@ -2,6 +2,7 @@ local syntax = require "core.syntax"
 
 syntax.add {
   files = { "%.xml$", "%.html?$" },
+  headers = "<%?xml",
   patterns = {
     { pattern = { "<!%-%-", "%-%->" },     type = "comment"  },
     { pattern = { '%f[^>][^<]', '%f[<]' }, type = "normal"   },

src/main.c

@@ -7,8 +7,6 @@
   #include <windows.h>
 #elif __linux__
   #include <unistd.h>
-#elif __APPLE__
-  #include <mach-o/dyld.h>
 #endif
 
 
@@ -102,7 +100,7 @@ int main(int argc, char **argv) {
   }
   lua_setglobal(L, "ARGS");
 
-  lua_pushstring(L, "1.06");
+  lua_pushstring(L, "1.07");
   lua_setglobal(L, "VERSION");
 
   lua_pushstring(L, SDL_GetPlatform());