Merge branch 'master' into MergedMerged

3 files changed, 14 insertions, 7 deletions

diff --git a/data/core/common.lua b/data/core/common.lua
index 4b16ed1f..5077f851 100644
--- a/data/core/common.lua
+++ b/data/core/common.lua
@@ -300,6 +300,12 @@ end
 
 
 function common.relative_path(ref_dir, dir)
+  local drive_pattern = "^(%a):\\"
+  local drive, ref_drive = dir:match(drive_pattern), ref_dir:match(drive_pattern)
+  if drive and ref_drive and drive ~= ref_drive then
+    -- Windows, different drives, system.absolute_path fails for C:\..\D:\
+    return dir
+  end    
   local ref_ls = split_on_slash(ref_dir)
   local dir_ls = split_on_slash(dir)
   local i = 1
diff --git a/data/core/docview.lua b/data/core/docview.lua
index ceed8636..89da8190 100644
--- a/data/core/docview.lua
+++ b/data/core/docview.lua
@@ -112,7 +112,8 @@ end
 
 
 function DocView:get_gutter_width()
-  return self:get_font():get_width(#self.doc.lines) + style.padding.x * 2
+  local padding = style.padding.x * 2
+  return self:get_font():get_width(#self.doc.lines) + padding, padding
 end
 
 
@@ -381,7 +382,7 @@ function DocView:draw_line_body(idx, x, y)
 end
 
 
-function DocView:draw_line_gutter(idx, x, y)
+function DocView:draw_line_gutter(idx, x, y, width)
   local color = style.line_number
   for _, line1, _, line2 in self.doc:get_selections(true) do
     if idx >= line1 and idx <= line2 then
@@ -391,7 +392,7 @@ function DocView:draw_line_gutter(idx, x, y)
   end
   local yoffset = self:get_line_text_y_offset()
   x = x + style.padding.x
-  renderer.draw_text(self:get_font(), idx, x, y + yoffset, color)
+  common.draw_text(self:get_font(), color, idx, "right", x, y + yoffset, width,  self:get_line_height())
 end
 
 
@@ -420,12 +421,12 @@ function DocView:draw()
   local lh = self:get_line_height()
 
   local x, y = self:get_line_screen_position(minline)
+  local gw, gpad = self:get_gutter_width()
   for i = minline, maxline do
-    self:draw_line_gutter(i, self.position.x, y)
+    self:draw_line_gutter(i, self.position.x, y, gpad and gw - gpad or gw)
     y = y + lh
   end
 
-  local gw = self:get_gutter_width()
   local pos = self.position
   x, y = self:get_line_screen_position(minline)
   core.push_clip_rect(pos.x + gw, pos.y, self.size.x, self.size.y)
diff --git a/data/core/init.lua b/data/core/init.lua
index c68c487b..6fbdde48 100644
--- a/data/core/init.lua
+++ b/data/core/init.lua
@@ -646,8 +646,8 @@ local function check_plugin_version(filename)
   if info ~= nil and info.type == "dir" then
     filename = filename .. "/init.lua"
     info = system.get_file_info(filename)
-    if not info then return true end
   end
+  if not info or not filename:match("%.lua$") then return false end
   local f = io.open(filename, "r")
   if not f then return false end
   local version_match = false
@@ -667,7 +667,7 @@ local function check_plugin_version(filename)
     end
   end
   f:close()
-  return version_match
+  return true, version_match
 end