From d9bed68fe9af4502c62ff19bc27b0c4fca4034a6 Mon Sep 17 00:00:00 2001
From: Kevin Ballard <kevin@sb.org>
Date: Sat, 12 Jul 2014 13:39:53 -0700
Subject: [PATCH] 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.
---
 env.cpp | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/env.cpp b/env.cpp
index 8dd1e0af3..821bd8f1b 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())