aboutsummaryrefslogtreecommitdiffhomepage
path: root/env.cpp
diff options
context:
space:
mode:
authorGravatar Kevin Ballard <kevin@sb.org>2014-07-12 13:39:53 -0700
committerGravatar Kevin Ballard <kevin@sb.org>2014-07-12 14:07:55 -0700
commitd9bed68fe9af4502c62ff19bc27b0c4fca4034a6 (patch)
treebdf18aacbd424489735f4c7127dabfb27a9dc308 /env.cpp
parent2eb65b362518fe3407fa6fd759927ef3136ad0a6 (diff)
Mark COLUMNS/LINES as electric vars
They're dynamically calculated, so they qualify. This also removes them from the list of exported global variables, because they're actually not exported.
Diffstat (limited to 'env.cpp')
-rw-r--r--env.cpp9
1 files changed, 2 insertions, 7 deletions
diff --git a/env.cpp b/env.cpp
index 8dd1e0af..821bd8f1 100644
--- a/env.cpp
+++ b/env.cpp
@@ -490,6 +490,8 @@ void env_init(const struct config_paths_t *paths /* or NULL */)
env_electric.insert(L"history");
env_electric.insert(L"status");
env_electric.insert(L"umask");
+ env_electric.insert(L"COLUMNS");
+ env_electric.insert(L"LINES");
top = new env_node_t;
global_env = top;
@@ -1231,13 +1233,6 @@ wcstring_list_t env_get_names(int flags)
{
result.insert(result.end(), env_electric.begin(), env_electric.end());
}
-
- if (show_exported)
- {
- result.push_back(L"COLUMNS");
- result.push_back(L"LINES");
- }
-
}
if (show_universal && uvars())