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

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

1 files changed, 5 insertions, 4 deletions

diff --git a/screen.h b/screen.h
index 3b242147..78212ae5 100644
--- a/screen.h
+++ b/screen.h
@@ -13,6 +13,7 @@
 #define FISH_SCREEN_H
 
 #include <vector>
+#include "highlight.h"
 
 /**
    A class representing a single line of a screen.
@@ -20,7 +21,7 @@
 struct line_t
 {
     std::vector<wchar_t> text;
-    std::vector<int> colors;
+    std::vector<highlight_spec_t> colors;
     bool is_soft_wrapped;
 
     line_t() : text(), colors(), is_soft_wrapped(false)
@@ -33,7 +34,7 @@ struct line_t
         colors.clear();
     }
 
-    void append(wchar_t txt, int color)
+    void append(wchar_t txt, highlight_spec_t color)
     {
         text.push_back(txt);
         colors.push_back(color);
@@ -49,7 +50,7 @@ struct line_t
         return text.at(idx);
     }
 
-    int color_at(size_t idx) const
+    highlight_spec_t color_at(size_t idx) const
     {
         return colors.at(idx);
     }
@@ -189,7 +190,7 @@ void s_write(screen_t *s,
              const wcstring &right_prompt,
              const wcstring &commandline,
              size_t explicit_len,
-             const int *colors,
+             const highlight_spec_t *colors,
              const int *indent,
              size_t cursor_pos,
              size_t sel_start_pos,