aboutsummaryrefslogtreecommitdiffhomepage
path: root/highlight.cpp
diff options
context:
space:
mode:
authorGravatar ridiculousfish <corydoras@ridiculousfish.com>2014-01-13 00:31:25 -0800
committerGravatar ridiculousfish <corydoras@ridiculousfish.com>2014-01-13 00:31:25 -0800
commit746cc4c10b40cff7d0c88eac2448864506d8098b (patch)
tree747490fe4cad7cd456360e3c7395f9c518ee2494 /highlight.cpp
parent51c18e3f9a490cb6ae990442e783f7a0f106d5f1 (diff)
Rename highlight_shell_magic to highlight_shell_new_parser
Diffstat (limited to 'highlight.cpp')
-rw-r--r--highlight.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/highlight.cpp b/highlight.cpp
index f24bd6f1..32a8a27d 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();