From 1ebab6c2699e265f9e82962556c84cd5bcb6ab39 Mon Sep 17 00:00:00 2001 From: Frank LENORMAND Date: Sat, 25 Jan 2020 09:33:37 +0100 Subject: [PATCH] src: Show the startup information in no-load mode This commit allows the changelog to be shown at startup even when the editor was run with the -n flag. --- src/main.cc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main.cc b/src/main.cc index dabbb7b2..2cd6c540 100644 --- a/src/main.cc +++ b/src/main.cc @@ -1160,10 +1160,11 @@ int main(int argc, char* argv[]) StringView session = parser.get_switch("s").value_or(StringView{}); try { - auto flags = (parser.get_switch("n") ? ServerFlags::IgnoreKakrc : ServerFlags::None) | - (parser.get_switch("d") ? ServerFlags::Daemon : ServerFlags::None) | - (parser.get_switch("ro") ? ServerFlags::ReadOnly : ServerFlags::None) | - (argc == 1 and isatty(0) ? ServerFlags::StartupInfo : ServerFlags::None); + auto ignore_kakrc = (bool)parser.get_switch("n"); + auto flags = (ignore_kakrc ? ServerFlags::IgnoreKakrc : ServerFlags::None) | + (parser.get_switch("d") ? ServerFlags::Daemon : ServerFlags::None) | + (parser.get_switch("ro") ? ServerFlags::ReadOnly : ServerFlags::None) | + ((argc == 2 and ignore_kakrc) and isatty(0) ? ServerFlags::StartupInfo : ServerFlags::None); auto debug_flags = option_from_string(Meta::Type{}, parser.get_switch("debug").value_or("")); return run_server(session, server_init, client_init, init_coord, flags, ui_type, debug_flags, files); }