88df21fcb3
- Add -emacs-iedit patch to adapt to recent iedit changes. - Build with auto-complete, company-mode, and caml-mode support. - Add subpackages: dot-merlin-reader, emacs-merlin, and vim-merlin. - Generate autoloads for the Emacs interface.
11 lines
381 B
Diff
11 lines
381 B
Diff
--- a/tests/merlin-wrapper 2021-02-16 02:59:33.000000000 -0700
|
|
+++ b/tests/merlin-wrapper 2021-02-23 15:54:14.988017568 -0700
|
|
@@ -4,6 +4,6 @@ export PATH=$(dirname dot-merlin-reader)
|
|
|
|
touch .merlin && ocamlmerlin "$@" \
|
|
| jq 'del(.timing)' \
|
|
- | sed -e 's:"[^"]*lib/ocaml:"lib/ocaml:g' \
|
|
+ | sed -re 's:"[^"]*lib(64)?/ocaml:"lib/ocaml:g' \
|
|
| sed -e 's:\\n:\
|
|
:g'
|