diff -r fbc4eb8e2433 -r 5bea95a1d353 mercurial/ui.py
--- a/mercurial/ui.py	Sun Mar 26 21:40:22 2017 -0700
+++ b/mercurial/ui.py	Sun Mar 26 21:41:42 2017 -0700
@@ -1326,9 +1326,7 @@
         else:
             editor = 'vi'
         return (encoding.environ.get("HGEDITOR") or
-                self.config("ui", "editor") or
-                encoding.environ.get("VISUAL") or
-                encoding.environ.get("EDITOR", editor))
+                self.config("ui", "editor", editor))
 
     @util.propertycache
     def _progbar(self):