Compare commits

..

No commits in common. "c88c6faf6e4805de2655ea180dbc0a89c8b6f290" and "a74747e1f53ae956e63e565b69ec13154a2064b9" have entirely different histories.

2 changed files with 4 additions and 5 deletions

View file

@ -148,7 +148,7 @@ Bugs fixed in this fork that remain open upstream.
| [#678](https://github.com/stevearc/oil.nvim/issues/678) | tracking | `buftype='acwrite'` causes `mksession` to skip oil windows | | [#678](https://github.com/stevearc/oil.nvim/issues/678) | tracking | `buftype='acwrite'` causes `mksession` to skip oil windows |
| [#679](https://github.com/stevearc/oil.nvim/issues/679) | resolved | Executable file sign — PR [#698](https://github.com/stevearc/oil.nvim/pull/698) | | [#679](https://github.com/stevearc/oil.nvim/issues/679) | resolved | Executable file sign — PR [#698](https://github.com/stevearc/oil.nvim/pull/698) |
| [#682](https://github.com/stevearc/oil.nvim/issues/682) | open | `get_current_dir()` nil in non-telescope context | | [#682](https://github.com/stevearc/oil.nvim/issues/682) | open | `get_current_dir()` nil in non-telescope context |
| [#683](https://github.com/stevearc/oil.nvim/issues/683) | fixed | Path not shown in floating mode — title shown via fallback when border is nil | | [#683](https://github.com/stevearc/oil.nvim/issues/683) | open | Path not shown in floating mode |
| [#684](https://github.com/stevearc/oil.nvim/issues/684) | open | User and group columns | | [#684](https://github.com/stevearc/oil.nvim/issues/684) | open | User and group columns |
| [#685](https://github.com/stevearc/oil.nvim/issues/685) | open | Plain directory paths in buffer names | | [#685](https://github.com/stevearc/oil.nvim/issues/685) | open | Plain directory paths in buffer names |
| [#690](https://github.com/stevearc/oil.nvim/issues/690) | resolved | `OilFileIcon` highlight group — [`ce64ae1`](https://github.com/barrettruth/canola.nvim/commit/ce64ae1) | | [#690](https://github.com/stevearc/oil.nvim/issues/690) | resolved | `OilFileIcon` highlight group — [`ce64ae1`](https://github.com/barrettruth/canola.nvim/commit/ce64ae1) |

View file

@ -305,7 +305,8 @@ M.open_float = function(dir, opts, cb)
vim.api.nvim_set_option_value(k, v, { scope = 'local', win = winid }) vim.api.nvim_set_option_value(k, v, { scope = 'local', win = winid })
end end
if config.float.border ~= nil and config.float.border ~= 'none' then -- Update the floating window title
if vim.fn.has('nvim-0.9') == 1 and config.float.border ~= 'none' then
local cur_win_opts = vim.api.nvim_win_get_config(winid) local cur_win_opts = vim.api.nvim_win_get_config(winid)
vim.api.nvim_win_set_config(winid, { vim.api.nvim_win_set_config(winid, {
relative = 'editor', relative = 'editor',
@ -315,8 +316,6 @@ M.open_float = function(dir, opts, cb)
height = cur_win_opts.height, height = cur_win_opts.height,
title = util.get_title(winid), title = util.get_title(winid),
}) })
else
util.add_title_to_win(winid)
end end
end, end,
}) })
@ -336,7 +335,7 @@ M.open_float = function(dir, opts, cb)
end end
end) end)
if config.float.border == nil or config.float.border == 'none' then if vim.fn.has('nvim-0.9') == 0 then
util.add_title_to_win(winid) util.add_title_to_win(winid)
end end
end end