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

Preserve selections when converting to client mode

Browse Source 
Fixes #742
This commit is contained in:
Maxime Coste 2016-08-05 08:16:43 +01:00
parent b3f4840f45
commit 373c21e875
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main.cc
View File

@ -272,6 +272,7 @@ struct convert_to_client_mode
{ {
String session; String session;
String buffer_name; String buffer_name;
String selections;
}; };
enum class UIType enum class UIType
@ -592,6 +593,7 @@ int run_server(StringView session, StringView init_command,
if (convert_to_client_pending) if (convert_to_client_pending)
{ {
String buffer_name = local_client->context().buffer().name(); String buffer_name = local_client->context().buffer().name();
String selections = selection_list_to_string(local_client->context().selections());
ClientManager::instance().remove_client(*local_client, true); ClientManager::instance().remove_client(*local_client, true);
convert_to_client_pending = false; convert_to_client_pending = false;
@ -600,7 +602,7 @@ int run_server(StringView session, StringView init_command,
{ {
String session = server.session(); String session = server.session();
server.close_session(false); server.close_session(false);
throw convert_to_client_mode{ std::move(session), std::move(buffer_name) }; throw convert_to_client_mode{ std::move(session), std::move(buffer_name), std::move(selections) };
} }
} }
} }
@ -860,8 +862,8 @@ int main(int argc, char* argv[])
{ {
raise(SIGTSTP); raise(SIGTSTP);
return run_client(convert.session, return run_client(convert.session,
format("try %^buffer '{}'^; echo converted to client only mode", format("try %^buffer '{}'; select '{}'^; echo converted to client only mode",
escape(convert.buffer_name, "'^", '\\')), ui_type); escape(convert.buffer_name, "'^", '\\'), convert.selections), ui_type);
} }
} }
} }