Merge remote-tracking branch 'upstream/master' into bind_mode

Conflicts:
	builtin.cpp
	reader.cpp
	share/functions/fish_default_key_bindings.fish

1 files changed, 3 insertions, 2 deletions

diff --git a/reader.h b/reader.h
index 7e1cadf6..92c22a84 100644
--- a/reader.h
+++ b/reader.h
@@ -16,6 +16,7 @@
 #include "io.h"
 #include "common.h"
 #include "complete.h"
+#include "highlight.h"
 
 class parser_t;
 class completion_t;
@@ -180,7 +181,7 @@ void reader_set_complete_function(complete_function_t);
  The type of a highlight function.
  */
 class env_vars_snapshot_t;
-typedef void (*highlight_function_t)(const wcstring &, std::vector<int> &, size_t, wcstring_list_t *, const env_vars_snapshot_t &vars);
+typedef void (*highlight_function_t)(const wcstring &, std::vector<highlight_spec_t> &, size_t, wcstring_list_t *, const env_vars_snapshot_t &vars);
 
 /**
  Specify function for syntax highlighting. The function must take these arguments:
@@ -224,7 +225,7 @@ void reader_set_exit_on_interrupt(bool flag);
 /**
    Returns true if the shell is exiting, 0 otherwise.
 */
-int exit_status();
+bool shell_is_exiting();
 
 /**
    The readers interrupt signal handler. Cancels all currently running blocks.