changeset 31687:5bea95a1d353

ui: simplify geteditor Now $EDITOR and $VISUAL will affect ui.editor directly. So it's no longer necessary to test them in ui.geteditor.
author Jun Wu <quark@fb.com>
date Sun, 26 Mar 2017 21:41:42 -0700
parents fbc4eb8e2433
children c5fe0c7dad94
files mercurial/ui.py
diffstat 1 files changed, 1 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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):