get EDITOR from environment in e2lib, take vi as the default editor

Signed-off-by: Gordon Hecker <gh@emlix.com>

diff --git a/generic/e2lib.lua b/generic/e2lib.lua
index 8737b38d2b3088c0c88b14d62dd46428c0da6ec2..a610cbd28f6802f749b12419cb398f9cbdc082a9 100644 (file)
--- a/generic/e2lib.lua
+++ b/generic/e2lib.lua
@@ -137,6 +137,7 @@ function e2lib.init()
   local getenv = {
        { name = "HOME", required = true },
        { name = "USER", required = true },
+       { name = "EDITOR", required = false, default = "vi" },
        { name = "TERM", required = false, default = "linux" },
        { name = "E2_CONFIG", required = false },
        { name = "TMPDIR", required = false, default = "/tmp" },

diff --git a/local/cf.lua b/local/cf.lua
index 9e828a6b72c1fdd2b0c167ec8cd826a959ad32af..e0451633917e666e26483e0fc17c96bdd6bab0a0 100755 (executable)
--- a/local/cf.lua
+++ b/local/cf.lua
@@ -65,10 +65,7 @@ if not rc then
   e2lib.abort(re)
 end
 
-local editor = os.getenv("EDITOR")
-if not editor then
-  editor = "vi"
-end
+local editor = e2lib.osenv["EDITOR"]
 
 local commands = {}