buggy-auto-complete is not so buggy now. Merged branch 'buggy-auto-complete' into CPlusPlus

1 files changed, 3 insertions, 4 deletions

diff --git a/reader.h b/reader.h
index 138ecbcc..6f99ba4f 100644
--- a/reader.h
+++ b/reader.h
@@ -9,12 +9,14 @@
 #ifndef FISH_READER_H
 #define FISH_READER_H
 
+#include <vector>
 #include <wchar.h>
 
 #include "util.h"
 #include "io.h"
 
 class parser_t;
+struct completion_t;
 
 /**
   Read commands from \c fd until encountering EOF
@@ -125,18 +127,15 @@ void reader_pop();
    - The command to be completed as a null terminated array of wchar_t
    - An array_list_t in which completions will be inserted.
 */
-void reader_set_complete_function( void (*f)( const wchar_t *, array_list_t * ) );
+void reader_set_complete_function( void (*f)( const wchar_t *, std::vector<completion_t> & ) );
 
 /**
-<<<<<<< upstream
-=======
  The type of a highlight function.
  */
 class env_vars;
 typedef void (*highlight_function_t)( const wchar_t *, int *, int, array_list_t *, const env_vars &vars );
 
 /**
->>>>>>> HEAD~2
  Specify function for syntax highlighting. The function must take these arguments:
  
  - The command to be highlighted as a null terminated array of wchar_t