made vi not choke when opening a new file, as well as actually preserve the file name

This commit is contained in:
Izaya 2020-08-21 10:28:51 +10:00
parent 0db31a2e27
commit d12ec38016

View File

@ -17,7 +17,7 @@ end
function ed.bfunc:save(fpath) function ed.bfunc:save(fpath)
local path = fpath or self.path local path = fpath or self.path
if not path then return false, "no path" end if not path then return false, "no path" end
self.path = path self.path = path
local f = io.open(path,"wb") local f = io.open(path,"wb")
if not f then return false, "unable to open file" end if not f then return false, "unable to open file" end
for k,v in ipairs(self) do for k,v in ipairs(self) do
@ -112,6 +112,7 @@ function ed.newBuffer()
end end
function ed.open(buffer) function ed.open(buffer)
local bpath = buffer
if ed.buffers[buffer] then if ed.buffers[buffer] then
buffer = ed.buffers[buffer] buffer = ed.buffers[buffer]
end end
@ -120,7 +121,9 @@ function ed.open(buffer)
nb:load(buffer) nb:load(buffer)
buffer = nb buffer = nb
end end
if type(buffer) ~= "table" then buffer = ed.newBuffer() buffer[1] = "" end if type(buffer) ~= "table" then buffer = ed.newBuffer() end
buffer[1] = buffer[1] or ""
buffer.path = buffer.path or bpath
return buffer return buffer
end end