From 746cc4c10b40cff7d0c88eac2448864506d8098b Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Mon, 13 Jan 2014 00:31:25 -0800
Subject: [PATCH] Rename highlight_shell_magic to highlight_shell_new_parser

---
 fish_tests.cpp | 1 -
 highlight.cpp  | 4 ++--
 highlight.h    | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/fish_tests.cpp b/fish_tests.cpp
index 070004b1b..e3da9a7f3 100644
--- a/fish_tests.cpp
+++ b/fish_tests.cpp
@@ -59,7 +59,6 @@
 #include "iothread.h"
 #include "postfork.h"
 #include "signal.h"
-#include "highlight.h"
 #include "parse_tree.h"
 #include "parse_util.h"
 
diff --git a/highlight.cpp b/highlight.cpp
index f24bd6f19..32a8a27d7 100644
--- a/highlight.cpp
+++ b/highlight.cpp
@@ -1245,7 +1245,7 @@ void highlight_shell(const wcstring &buff, std::vector<int> &color, size_t pos,
 {
     if (1)
     {
-        highlight_shell_magic(buff, color, pos, error, vars);
+        highlight_shell_new_parser(buff, color, pos, error, vars);
     }
     else
     {
@@ -2186,7 +2186,7 @@ const highlighter_t::color_array_t & highlighter_t::highlight()
     return color_array;
 }
 
-void highlight_shell_magic(const wcstring &buff, std::vector<int> &color, size_t pos, wcstring_list_t *error, const env_vars_snapshot_t &vars)
+void highlight_shell_new_parser(const wcstring &buff, std::vector<int> &color, size_t pos, wcstring_list_t *error, const env_vars_snapshot_t &vars)
 {
     /* Do something sucky and get the current working directory on this background thread. This should really be passed in. */
     const wcstring working_directory = env_get_pwd_slash();
diff --git a/highlight.h b/highlight.h
index eb123258c..40a535518 100644
--- a/highlight.h
+++ b/highlight.h
@@ -84,7 +84,7 @@ struct file_detection_context_t;
    \param error a list in which a description of each error will be inserted. May be 0, in whcich case no error descriptions will be generated.
 */
 void highlight_shell(const wcstring &buffstr, std::vector<int> &color, size_t pos, wcstring_list_t *error, const env_vars_snapshot_t &vars);
-void highlight_shell_magic(const wcstring &buffstr, std::vector<int> &color, size_t pos, wcstring_list_t *error, const env_vars_snapshot_t &vars);
+void highlight_shell_new_parser(const wcstring &buffstr, std::vector<int> &color, size_t pos, wcstring_list_t *error, const env_vars_snapshot_t &vars);
 
 /**
    Perform syntax highlighting for the text in buff. Matching quotes and paranthesis are highlighted. The result is
@@ -136,7 +136,7 @@ bool is_potential_path(const wcstring &const_path, const wcstring_list_t &direct
 
 /* For testing */
 void highlight_shell_classic(const wcstring &buff, std::vector<int> &color, size_t pos, wcstring_list_t *error, const env_vars_snapshot_t &vars);
-void highlight_shell_magic(const wcstring &buff, std::vector<int> &color, size_t pos, wcstring_list_t *error, const env_vars_snapshot_t &vars);
+void highlight_shell_new_parser(const wcstring &buff, std::vector<int> &color, size_t pos, wcstring_list_t *error, const env_vars_snapshot_t &vars);
 
 #endif