diff --git a/merlin/helpers.py b/merlin/helpers.py index c4d2f58..87c0844 100644 --- a/merlin/helpers.py +++ b/merlin/helpers.py @@ -44,7 +44,6 @@ def only_ocaml(func): @functools.wraps(func) def wrapper(self, view, *args, **kwargs): - if is_ocaml(view): return func(self, view, *args, **kwargs) diff --git a/merlin/process.py b/merlin/process.py index 9004d70..ac49768 100644 --- a/merlin/process.py +++ b/merlin/process.py @@ -63,9 +63,9 @@ def restart(self): stdout=subprocess.PIPE, stderr=None, ) - except OSError as e: - print("Failed starting ocamlmerlin. Please ensure that ocamlmerlin \ - binary is executable.") + except (OSError, FileNotFoundError) as e: + print("Failed starting ocamlmerlin. Please ensure that ocamlmerlin" + "binary is executable.") raise e def send_command(self, *cmd):