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

fix launching on new file

Browse Source
This commit is contained in:
Maxime Coste 2011-11-09 14:17:46 +00:00
parent 55c092eed9
commit 5aeee719dd
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main.cc
View File

@ -362,12 +362,8 @@ void do_go(Window& window, int count)
Window* current_window; Window* current_window;
void edit(const CommandParameters& params) Buffer* open_or_create(const std::string& filename)
{ {
if (params.size() != 1)
throw wrong_argument_count();
std::string filename = params[0];
Buffer* buffer = NULL; Buffer* buffer = NULL;
try try
{ {
@ -378,7 +374,16 @@ void edit(const CommandParameters& params)
print_status("new file " + filename); print_status("new file " + filename);
buffer = new Buffer(filename, Buffer::Type::File); buffer = new Buffer(filename, Buffer::Type::File);
} }
current_window = buffer->get_or_create_window(); return buffer;
}
void edit(const CommandParameters& params)
{
if (params.size() != 1)
throw wrong_argument_count();
std::string filename = params[0];
current_window = open_or_create(filename)->get_or_create_window();
} }
void write_buffer(const CommandParameters& params) void write_buffer(const CommandParameters& params)
@ -618,7 +623,7 @@ int main(int argc, char* argv[])
try try
{ {
auto buffer = (argc > 1) ? create_buffer_from_file(argv[1]) : new Buffer("*scratch*", Buffer::Type::Scratch); auto buffer = (argc > 1) ? open_or_create(argv[1]) : new Buffer("*scratch*", Buffer::Type::Scratch);
current_window = buffer->get_or_create_window(); current_window = buffer->get_or_create_window();
draw_window(*current_window); draw_window(*current_window);