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

src/completion.cc

@@ -30,7 +30,7 @@ Completions shell_complete(const Context& context, CompletionFlags flags,
                                                   cursor_pos - word_start);
     else
         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);
     return completions;
 }

src/diff.hh

@@ -32,7 +32,7 @@ private:
     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>
 Snake find_end_snake_of_further_reaching_dpath(Iterator a, int N, Iterator b, int M,