diff --git a/uppsrc/CodeEditor/CInit.cpp b/uppsrc/CodeEditor/CInit.cpp index 90f7fe056..d16faaa9b 100644 --- a/uppsrc/CodeEditor/CInit.cpp +++ b/uppsrc/CodeEditor/CInit.cpp @@ -24,15 +24,15 @@ void CSyntax::InitKeywords() "__finally", "__inline", "__int16", "__int32", "__int64", "__int8", "__leave", "__stdcall", "__try", "__uuidof", "alignas", "alignof", "and", "and_eq", "asm", "auto", - "bitand", "bitor", "bool", "break","case", "catch", + "bitand", "bitor", "bool", "break", "case", "catch", "char", "char8_t", "char16_t", "char32_t", "class", "co_await", "co_return", "co_yield", "compl", "concept", "const", "const_cast", "consteval", "constexpr", "constinit", "continue", "decltype", "default", "delete", "dllexport", "dllimport", "do", "double", "dynamic_cast", "else", "enum", - "explicit", "export", "extern" "false", "final", "float", + "explicit", "export", "extern", "false", "final", "float", "for", "force_inline", "friend", "goto", "if", "import", - "inline", "int", "long", "module" "mutable", "namespace", + "inline", "int", "long", "module", "mutable", "namespace", "never_inline", "new", "noexcept", "not", "not_eq", "nullptr", "operator", "or", "or_eq", "override", "private", "protected", "public", "register", "reinterpret_cast", "requires", "return", diff --git a/uppsrc/Core/Util.cpp b/uppsrc/Core/Util.cpp index 59aceaf37..555badfeb 100644 --- a/uppsrc/Core/Util.cpp +++ b/uppsrc/Core/Util.cpp @@ -825,7 +825,7 @@ static void LinuxBeep(const char *name) { static String player; ONCELOCK { - const char *players[] = { "play", "ogg123", "gst123" }; + const char *players[] = { "play", "ogg123", "gst123", "gst-play-1.0" }; for(int i = 0; i < __countof(players); i++) if(Sys("which " + String(players[i])).GetCount()) { player = players[i]; @@ -838,9 +838,9 @@ static void LinuxBeep(const char *name) IGNORE_RESULT(system(player + " -q " + fn + (FileExists(fn + ".ogg") ? ".ogg" : FileExists(fn + ".oga") ? ".oga" : - FileExists(fn + ".wav") ? ".wav" : - ".*") - + " >/dev/null 2>/dev/null&")); + FileExists(fn + ".wav") ? ".wav" : + ".*") + + " >/dev/null 2>/dev/null&")); } }