Prefer VISUAL to EDITOR

fmoo · fmoo · commit 97090d76ea85 · 2015-01-10T23:00:07.000-08:00
Also, use environ.get() instead of os.path.expandvars()
diff --git a/editor.py b/editor.py
@@ -50,10 +50,12 @@ def get_platform_editor_var():
 
 
 def get_editor():
-    env_editor = os.path.expandvars('$EDITOR')
-    if env_editor != '$EDITOR' and env_editor.strip():
-        return env_editor
+    # Get the editor from the environment.  Prefer VISUAL to EDITOR
+    editor = os.environ.get('VISUAL') or os.environ.get('EDITOR')
+    if editor:
+        return editor
 
+    # None found in the environment.  Fallback to platform-specific defaults.
     for ed in get_default_editors():
         path = find_executable(ed)
         if path is not None:
