diff options
| author | Maxime Coste <mawww@kakoune.org> | 2018-04-07 15:36:39 +1000 |
|---|---|---|
| committer | Maxime Coste <mawww@kakoune.org> | 2018-04-07 16:27:50 +1000 |
| commit | 57baad4afde8d1bab4040c5a5cbe8a5b367bceba (patch) | |
| tree | 5e4f5fba17f8a6038301fcb129f36db102b0bd70 /src/main.cc | |
| parent | 6adb28ec1243adf13126ee47444d57dd2b842945 (diff) | |
Make FaceRegistry scoped
set-face now takes a scope argument, and faces can be overridden on
a buffer or window basis.
colorscheme apply on global scope, which should be good enough for
now.
Fixes #1411
Diffstat (limited to 'src/main.cc')
| -rw-r--r-- | src/main.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main.cc b/src/main.cc index b7c62aec..8d6b2b67 100644 --- a/src/main.cc +++ b/src/main.cc @@ -50,7 +50,8 @@ static const char* startup_info = " * selections merging behaviour is now a bit more complex again\n" " * 'x' will only jump to next line if full line is already selected\n" " * WORD text object moved to <a-w> instead of W for consistency\n" -" * rotate main selection moved to ), rotate content to <a-)>, ( for backward\n"; +" * rotate main selection moved to ), rotate content to <a-)>, ( for backward\n" +" * faces are now scoped, set-face command takes an additional scope parameter\n"; struct startup_error : runtime_error { @@ -585,7 +586,6 @@ int run_server(StringView session, StringView server_init, RegisterManager register_manager; HighlighterRegistry highlighter_registry; DefinedHighlighters defined_highlighters; - FaceRegistry face_registry; ClientManager client_manager; BufferManager buffer_manager; @@ -667,7 +667,7 @@ int run_server(StringView session, StringView server_init, if (startup_error) local_client->print_status({ "error during startup, see *debug* buffer for details", - get_face("Error") + local_client->context().faces()["Error"] }); if (flags & ServerFlags::StartupInfo) |