diff options
| author | Maxime Coste <mawww@kakoune.org> | 2022-12-06 17:48:42 +1100 |
|---|---|---|
| committer | Maxime Coste <mawww@kakoune.org> | 2022-12-06 17:48:42 +1100 |
| commit | 933e4a599cfd3fc09edd67a024b8af08bbec7c01 (patch) | |
| tree | 5fd476b2a808cffed01ae3adfaecab0f35755281 /src/main.cc | |
| parent | e7e46ef76a374b9e4a1c48d068023a393d78601c (diff) | |
Load buffer in command line order
Pass the first buffer on the the command line explicitely to client
creation. This ensure the buffer list matches the command line, which
makes buffer-next/buffer-previous a bit more useful.
Fixes #2705
Diffstat (limited to 'src/main.cc')
| -rw-r--r-- | src/main.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/main.cc b/src/main.cc index 2b09ccd6..844b4574 100644 --- a/src/main.cc +++ b/src/main.cc @@ -754,7 +754,7 @@ enum class ServerFlags constexpr bool with_bit_ops(Meta::Type<ServerFlags>) { return true; } int run_server(StringView session, StringView server_init, - StringView client_init, Optional<BufferCoord> init_coord, + StringView client_init, StringView init_buffer, Optional<BufferCoord> init_coord, ServerFlags flags, UIType ui_type, DebugFlags debug_flags, ConstArrayView<StringView> files) { @@ -836,9 +836,7 @@ int run_server(StringView session, StringView server_init, if (not files.empty()) try { - // create buffers in reverse order so that the first given buffer - // is the most recently created one. - for (auto& file : files | reverse()) + for (auto& file : files) { try { @@ -867,7 +865,7 @@ int run_server(StringView session, StringView server_init, if (not server.is_daemon()) { local_client = client_manager.create_client( - create_local_ui(ui_type), getpid(), {}, get_env_vars(), client_init, std::move(init_coord), + create_local_ui(ui_type), getpid(), {}, get_env_vars(), client_init, init_buffer, std::move(init_coord), [](int status) { local_client_exit = status; }); if (startup_error and local_client) @@ -1234,7 +1232,7 @@ int main(int argc, char* argv[]) ((argc == 1 or (ignore_kakrc and argc == 2)) and isatty(0) ? ServerFlags::StartupInfo : ServerFlags::None); auto debug_flags = option_from_string(Meta::Type<DebugFlags>{}, parser.get_switch("debug").value_or("")); - return run_server(session, server_init, client_init, init_coord, flags, ui_type, debug_flags, files); + return run_server(session, server_init, client_init, files.empty() ? StringView{} : files[0], init_coord, flags, ui_type, debug_flags, files); } catch (convert_to_client_mode& convert) { |