xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'lenormf/startup_info-no_kakrc'

Browse Source
This commit is contained in:
Maxime Coste 2020-02-07 07:00:25 +11:00
commit a105111593
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main.cc
View File

@ -1160,10 +1160,11 @@ int main(int argc, char* argv[])
StringView session = parser.get_switch("s").value_or(StringView{}); StringView session = parser.get_switch("s").value_or(StringView{});
try try
{ {
auto flags = (parser.get_switch("n") ? ServerFlags::IgnoreKakrc : ServerFlags::None) | auto ignore_kakrc = (bool)parser.get_switch("n");
(parser.get_switch("d") ? ServerFlags::Daemon : ServerFlags::None) | auto flags = (ignore_kakrc ? ServerFlags::IgnoreKakrc : ServerFlags::None) |
(parser.get_switch("ro") ? ServerFlags::ReadOnly : ServerFlags::None) | (parser.get_switch("d") ? ServerFlags::Daemon : ServerFlags::None) |
(argc == 1 and isatty(0) ? ServerFlags::StartupInfo : 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<DebugFlags>{}, parser.get_switch("debug").value_or("")); 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, init_coord, flags, ui_type, debug_flags, files);
} }