From 020ad62aa38e87f2fe8bb5faab496e3e1ca99733 Mon Sep 17 00:00:00 2001
From: mitchell <70453897+667e-11@users.noreply.github.com>
Date: Tue, 30 Dec 2008 19:31:34 -0500
Subject: Fixes to recognize Windows path separators.

---
 core/ext/mime_types.lua         | 4 ++--
 core/ext/pm/buffer_browser.lua  | 2 +-
 core/ext/pm/project_browser.lua | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'core/ext')

diff --git a/core/ext/mime_types.lua b/core/ext/mime_types.lua
index ef848cb1..f54eb602 100644
--- a/core/ext/mime_types.lua
+++ b/core/ext/mime_types.lua
@@ -261,7 +261,7 @@ local patterns = {
 local function set_lexer_from_filename(filename)
   local lexer
   if filename then
-    local ext = filename:match('[^/]+$'):match('[^.]+$')
+    local ext = filename:match('[^/\\]+$'):match('[^.]+$')
     lexer = extensions[ext]
   end
   buffer:set_lexer_language(lexer or 'container')
@@ -302,7 +302,7 @@ end
 -- @param filename The filename used to load a language module from.
 local function load_language_module_from_filename(filename)
   if not filename then return end
-  local ext = filename:match('[^/]+$'):match('[^.]+$')
+  local ext = filename:match('[^/\\]+$'):match('[^.]+$')
   local lang = extensions[ext]
   if lang then
     local ret, err = pcall(require, lang)
diff --git a/core/ext/pm/buffer_browser.lua b/core/ext/pm/buffer_browser.lua
index d894da49..6c292200 100644
--- a/core/ext/pm/buffer_browser.lua
+++ b/core/ext/pm/buffer_browser.lua
@@ -15,7 +15,7 @@ function get_contents_for()
     index = string.format("%02i", index)
     contents[index] = {
       pixbuf = buffer.dirty and 'gtk-edit' or 'gtk-file',
-      text = (buffer.filename or 'Untitled'):match('[^/]+$')
+      text = (buffer.filename or 'Untitled'):match('[^/\\]+$')
     }
   end
   return contents
diff --git a/core/ext/pm/project_browser.lua b/core/ext/pm/project_browser.lua
index 4e96dab9..0b47a3b2 100644
--- a/core/ext/pm/project_browser.lua
+++ b/core/ext/pm/project_browser.lua
@@ -154,7 +154,7 @@ function perform_menu_action(menu_item, selected_item)
           -- If the user is saving to a different folder than was selected,
           -- caution them about unexpected behavior and ask to save in the
           -- project root instead.
-          if dir and file:match('^(.+)/') ~= dir then
+          if dir and file:match('^(.+)[/\\]') ~= dir then
             local ret = cocoa_dialog( 'yesno-msgbox', {
               text = 'Add to Project Root Instead?',
               ['informative-text'] = 'You are adding a new file to a live '..
-- 
cgit v1.2.3