aboutsummaryrefslogtreecommitdiffhomepage
path: root/reader.cpp
diff options
context:
space:
mode:
authorGravatar ridiculousfish <corydoras@ridiculousfish.com>2012-07-20 20:39:31 -0700
committerGravatar ridiculousfish <corydoras@ridiculousfish.com>2012-07-20 20:39:31 -0700
commitb08fb866378693d2e75f17fdfe5e60401a29136a (patch)
treead1eb00129b96d284ab9ed4ca2de1cc176219777 /reader.cpp
parentb290fd33b973e573ffc7fc0c87be3ab431678b5f (diff)
Renamed env_vars to env_vars_snapshot_t
Cleanup of non-wcstring version of path_get_path
Diffstat (limited to 'reader.cpp')
-rw-r--r--reader.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/reader.cpp b/reader.cpp
index 74c519e6..b6fb1d17 100644
--- a/reader.cpp
+++ b/reader.cpp
@@ -1078,7 +1078,7 @@ struct autosuggestion_context_t {
history_search_t searcher;
file_detection_context_t detector;
const wcstring working_directory;
- const env_vars vars;
+ const env_vars_snapshot_t vars;
wcstring_list_t commands_to_load;
const unsigned int generation_count;
@@ -1091,7 +1091,7 @@ struct autosuggestion_context_t {
searcher(*history, term, HISTORY_SEARCH_TYPE_PREFIX),
detector(history, term),
working_directory(get_working_directory()),
- vars(env_vars::highlighting_keys),
+ vars(env_vars_snapshot_t::highlighting_keys),
generation_count(s_generation_count),
has_tried_reloading(false)
{
@@ -2223,7 +2223,7 @@ public:
const highlight_function_t highlight_function;
/** Environment variables */
- const env_vars vars;
+ const env_vars_snapshot_t vars;
/** When the request was made */
const double when;
@@ -2235,7 +2235,7 @@ public:
string_to_highlight(pbuff),
match_highlight_pos(phighlight_pos),
highlight_function(phighlight_func),
- vars(env_vars::highlighting_keys),
+ vars(env_vars_snapshot_t::highlighting_keys),
when(timef()),
generation_count(s_generation_count)
{