From ddaf05544d182bd75471ce307458daf417c9e17f Mon Sep 17 00:00:00 2001
From: Alasdair
Date: Wed, 6 Feb 2019 23:08:48 +0000
Subject: Emacs mode understands relationships between Sail files

Allow a file sail.json in the same directory as the sail source file
which contains the ordering and options needed for sail files involved
in a specific ISA definition. I have an example for v8.5 in sail-arm.
The interactive Sail process running within emacs then knows about the
relationship between Sail files, so C-c C-l works for files in the ARM
spec. Also added a C-c C-x command to jump to a type error. Requires
yojson library to build interactive Sail.
---
 .merlin | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.merlin')

diff --git a/.merlin b/.merlin
index d764f5eb..92bbd164 100644
--- a/.merlin
+++ b/.merlin
@@ -9,4 +9,4 @@ S src/lem_interp/**
 S src/pprint/**
 S src/test/**
 B src/_build/**
-PKG num str unix uint zarith linksem lem omd linenoise
\ No newline at end of file
+PKG num str unix uint zarith linksem lem omd linenoise yojson
-- 
cgit v1.2.3