From: Karl Hasselström <kha@treskal.com>
Date: Mon, 28 Jan 2008 20:19:34 +0000 (+0100)
Subject: Simplify editor selection logic
X-Git-Tag: v0.15-rc1~292
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/commitdiff_plain/c4f073ee7be827cf08965206bea8e37e7b97e53c?ds=sidebyside

Simplify editor selection logic

Signed-off-by: Karl Hasselström <kha@treskal.com>
---

diff --git a/stgit/utils.py b/stgit/utils.py
index 00776b0..43366c9 100644
--- a/stgit/utils.py
+++ b/stgit/utils.py
@@ -175,12 +175,8 @@ def call_editor(filename):
 
     # the editor
     editor = config.get('stgit.editor')
-    if editor:
-        pass
-    elif 'EDITOR' in os.environ:
-        editor = os.environ['EDITOR']
-    else:
-        editor = 'vi'
+    if not editor:
+        editor = os.environ.get('EDITOR', 'vi')
     editor += ' %s' % filename
 
     out.start('Invoking the editor: "%s"' % editor)