Merge pull request #10240 from ipython/auto-backport-of-pr-10239

Backport PR  #10239 on branch 5.x

IPython/lib/editorhooks.py

@@ -54,7 +54,7 b' def install_editor(template, wait=False):'
         if sys.platform.startswith('win'):
             cmd = shlex.split(cmd)
         proc = subprocess.Popen(cmd, shell=True)
-        if wait and proc.wait() != 0:
+        if proc.wait() != 0:
             raise TryNext()
         if wait:
             py3compat.input("Press Enter when done editing:")

IPython/lib/tests/test_editorhooks.py

@@ -18,6 +18,7 b' def test_install_editor():'
             'args': args,
             'kwargs': kwargs,
         })
+        return mock.MagicMock(**{'wait.return_value': 0})
     editorhooks.install_editor('foo -l {line} -f {filename}', wait=False)
     
     with mock.patch('subprocess.Popen', fake_popen):