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

edit command switch to the given buffer if it is already opened

Browse Source 
use edit! (or e!) to force reloading of the buffer
This commit is contained in:
Maxime Coste 2012-02-13 21:48:16 +00:00
parent 38d921f3d2
commit 3019ce3d3c
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main.cc
View File

@ -529,13 +529,21 @@ Buffer* open_or_create(const std::string& filename)
return buffer; return buffer;
} }
template<bool force_reload>
void edit(const CommandParameters& params, const Context& context) void edit(const CommandParameters& params, const Context& context)
{ {
if (params.size() != 1) if (params.size() != 1)
throw wrong_argument_count(); throw wrong_argument_count();
std::string filename = params[0]; std::string filename = params[0];
main_context = Context(*open_or_create(filename)->get_or_create_window());
Buffer* buffer = nullptr;
if (not force_reload)
buffer = BufferManager::instance().get_buffer(filename);
if (not buffer)
buffer = open_or_create(filename);
main_context = Context(*buffer->get_or_create_window());
} }
void write_buffer(const CommandParameters& params, const Context& context) void write_buffer(const CommandParameters& params, const Context& context)
@ -1145,7 +1153,10 @@ int main(int argc, char* argv[])
FilterRegistry filter_registry; FilterRegistry filter_registry;
GlobalHooksManager hooks_manager; GlobalHooksManager hooks_manager;
command_manager.register_commands({ "e", "edit" }, edit, command_manager.register_commands({ "e", "edit" }, edit<false>,
CommandManager::None,
PerArgumentCommandCompleter({ complete_filename }));
command_manager.register_commands({ "e!", "edit!" }, edit<true>,
CommandManager::None, CommandManager::None,
PerArgumentCommandCompleter({ complete_filename })); PerArgumentCommandCompleter({ complete_filename }));
command_manager.register_commands({ "q", "quit" }, quit<false>); command_manager.register_commands({ "q", "quit" }, quit<false>);