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

Merge branch 'ws' of git://github.com/jubalh/kakoune

Browse Source
This commit is contained in:
Maxime Coste 2015-11-19 21:56:45 +00:00
commit 2977cc97b3
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/completion.cc
View File

@ -30,7 +30,7 @@ Completions shell_complete(const Context& context, CompletionFlags flags,
cursor_pos - word_start); cursor_pos - word_start);
else else
completions.candidates = complete_filename(prefix.substr(word_start, word_end), completions.candidates = complete_filename(prefix.substr(word_start, word_end),
context.options()["ignored_files"].get<Regex>(), context.options()["ignored_files"].get<Regex>(),
cursor_pos - word_start); cursor_pos - word_start);
return completions; return completions;
} }

2
src/diff.hh
View File

@ -32,7 +32,7 @@ private:
int size; int size;
}; };
struct Snake{ int x, y, u, v; bool add; }; struct Snake{ int x, y, u, v; bool add; };
template<typename Iterator, typename Equal> template<typename Iterator, typename Equal>
Snake find_end_snake_of_further_reaching_dpath(Iterator a, int N, Iterator b, int M, Snake find_end_snake_of_further_reaching_dpath(Iterator a, int N, Iterator b, int M,