From 6958ded4c4da6ac040d61695ad978c22e8db45fc Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 31 Jul 2019 06:37:17 +0530
Subject: [PATCH] Dont fail to start if running the shell to read the EDITOR
 env var fails

Fixes #1869
---
 docs/changelog.rst | 7 +++++++
 kitty/main.py      | 3 +++
 2 files changed, 10 insertions(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 354740740..1988996cb 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -4,6 +4,13 @@ Changelog
 |kitty| is a feature full, cross-platform, *fast*, GPU based terminal emulator.
 To update |kitty|, :doc:`follow the instructions <binary>`.
 
+0.14.4 [future]
+---------------------
+
+- Dont fail to start if running the shell to read the EDITOR env var fails
+  (:iss:`1869`)
+
+
 0.14.3 [2019-07-29]
 ---------------------
 
diff --git a/kitty/main.py b/kitty/main.py
index 5a5c3af40..eaa35f38c 100644
--- a/kitty/main.py
+++ b/kitty/main.py
@@ -217,6 +217,9 @@ def read_shell_environment(opts):
                 k, v = line.partition('=')[::2]
                 if k and v:
                     ans[k] = v
+        else:
+            log_error('Failed to run shell to read its environment')
+            read_shell_environment.ans = {}
     return read_shell_environment.ans