Update 'stg pull' to the latest 'git pull' API

[stgit] / stgit / stack.py

diff --git a/stgit/stack.py b/stgit/stack.py
index cfac219..7a91b0c 100644 (file)
--- a/stgit/stack.py
+++ b/stgit/stack.py
@@ -92,7 +92,9 @@ def edit_file(series, string, comment, show_patch = True):
     f.close()
 
     # the editor
-    if 'EDITOR' in os.environ:
+    if config.has_option('stgit', 'editor'):
+        editor = config.get('stgit', 'editor')
+    elif 'EDITOR' in os.environ:
         editor = os.environ['EDITOR']
     else:
         editor = 'vi'