diff options
| author | Kartik K. Agaram <vc@akkartik.com> | 2022-09-10 19:26:44 -0700 |
|---|---|---|
| committer | Kartik K. Agaram <vc@akkartik.com> | 2022-09-10 19:26:44 -0700 |
| commit | 7fb71f92199000a470cbac36fa4de31db810d88a (patch) | |
| tree | b01fd39dc278445edad28e1a43779e0c81274eda | |
| parent | 81b0646ec1c3f9deae5e4b2c0b538102aa973a6e (diff) | |
| parent | b23269f3e03b69e914f8f6311e9c873508619949 (diff) | |
| download | view.love-7fb71f92199000a470cbac36fa4de31db810d88a.tar.gz | |
Merge text.love
| -rw-r--r-- | edit.lua | 2 | ||||
| -rw-r--r-- | run.lua | 5 | ||||
| -rw-r--r-- | source.lua | 5 | ||||
| -rw-r--r-- | source_edit.lua | 2 |
4 files changed, 8 insertions, 6 deletions
diff --git a/edit.lua b/edit.lua index 3c56ae0..553bc17 100644 --- a/edit.lua +++ b/edit.lua @@ -59,7 +59,7 @@ function edit.initialize_state(top, left, right, font_height, line_height) -- c right = right, width = right-left, - filename = love.filesystem.getUserDirectory()..'/lines.txt', + filename = love.filesystem.getUserDirectory()..'/lines.txt', -- '/' should work even on Windows -- search search_term = nil, diff --git a/run.lua b/run.lua index b86edc1..95e2efb 100644 --- a/run.lua +++ b/run.lua @@ -136,8 +136,9 @@ function run.settings() Settings.x, Settings.y, Settings.displayindex = love.window.getPosition() end local filename = Editor_state.filename - if filename:sub(1,1) ~= '/' then - filename = love.filesystem.getWorkingDirectory()..'/'..filename -- '/' should work even on Windows + local os_path_separator = package.config:sub(1,1) + if filename:sub(1,1) ~= os_path_separator then + filename = love.filesystem.getWorkingDirectory()..os_path_separator..filename end return { x=Settings.x, y=Settings.y, displayindex=Settings.displayindex, diff --git a/source.lua b/source.lua index 89c1021..2db1039 100644 --- a/source.lua +++ b/source.lua @@ -257,8 +257,9 @@ function source.settings() Settings.source.x, Settings.source.y, Settings.source.displayindex = love.window.getPosition() end local filename = Editor_state.filename - if filename:sub(1,1) ~= '/' then - filename = love.filesystem.getWorkingDirectory()..'/'..filename -- '/' should work even on Windows + local os_path_separator = package.config:sub(1,1) + if filename:sub(1,1) ~= os_path_separator then + filename = love.filesystem.getWorkingDirectory()..os_path_separator..filename end --? print('saving source settings', Settings.source.x, Settings.source.y, Settings.source.displayindex) return { diff --git a/source_edit.lua b/source_edit.lua index bcb1297..34752d0 100644 --- a/source_edit.lua +++ b/source_edit.lua @@ -100,7 +100,7 @@ function edit.initialize_state(top, left, right, font_height, line_height) -- c right = right, width = right-left, - filename = love.filesystem.getUserDirectory()..'/lines.txt', + filename = love.filesystem.getUserDirectory()..'/lines.txt', -- '/' should work even on Windows next_save = nil, -- undo |