experiment at avoiding some merge conflicts
https://merveilles.town/@akkartik/110084833821965708
This commit is contained in:
parent
a6dcfc5ac8
commit
0b1c47f79f
13
run.lua
13
run.lua
|
@ -33,8 +33,14 @@ function run.initialize(arg)
|
||||||
Text.redraw_all(Editor_state)
|
Text.redraw_all(Editor_state)
|
||||||
end
|
end
|
||||||
edit.check_locs(Editor_state)
|
edit.check_locs(Editor_state)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
-- keep a few blank lines around: https://merveilles.town/@akkartik/110084833821965708
|
||||||
love.window.setTitle('lines.love - '..Editor_state.filename)
|
love.window.setTitle('lines.love - '..Editor_state.filename)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if #arg > 1 then
|
if #arg > 1 then
|
||||||
print('ignoring commandline args after '..arg[1])
|
print('ignoring commandline args after '..arg[1])
|
||||||
end
|
end
|
||||||
|
@ -117,7 +123,14 @@ function run.file_drop(file)
|
||||||
file:close()
|
file:close()
|
||||||
Text.redraw_all(Editor_state)
|
Text.redraw_all(Editor_state)
|
||||||
edit.check_locs(Editor_state)
|
edit.check_locs(Editor_state)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
-- keep a few blank lines around: https://merveilles.town/@akkartik/110084833821965708
|
||||||
love.window.setTitle('lines.love - '..Editor_state.filename)
|
love.window.setTitle('lines.love - '..Editor_state.filename)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
function run.draw()
|
function run.draw()
|
||||||
|
|
14
source.lua
14
source.lua
|
@ -72,7 +72,14 @@ function source.initialize()
|
||||||
Menu_status_bar_height = 5 + Editor_state.line_height + 5
|
Menu_status_bar_height = 5 + Editor_state.line_height + 5
|
||||||
Editor_state.top = Editor_state.top + Menu_status_bar_height
|
Editor_state.top = Editor_state.top + Menu_status_bar_height
|
||||||
Log_browser_state.top = Log_browser_state.top + Menu_status_bar_height
|
Log_browser_state.top = Log_browser_state.top + Menu_status_bar_height
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
-- keep a few blank lines around: https://merveilles.town/@akkartik/110084833821965708
|
||||||
love.window.setTitle('lines.love - source')
|
love.window.setTitle('lines.love - source')
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
-- environment for a mutable file
|
-- environment for a mutable file
|
||||||
|
@ -218,7 +225,14 @@ function source.file_drop(file)
|
||||||
Text.redraw_all(Editor_state)
|
Text.redraw_all(Editor_state)
|
||||||
Editor_state.screen_top1 = {line=1, pos=1}
|
Editor_state.screen_top1 = {line=1, pos=1}
|
||||||
Editor_state.cursor1 = {line=1, pos=1}
|
Editor_state.cursor1 = {line=1, pos=1}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
-- keep a few blank lines around: https://merveilles.town/@akkartik/110084833821965708
|
||||||
love.window.setTitle('lines.love - source')
|
love.window.setTitle('lines.love - source')
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
-- a copy of source.file_drop when given a filename
|
-- a copy of source.file_drop when given a filename
|
||||||
|
|
Loading…
Reference in New Issue