Update version to 2.5.0

ocaml · Jun 13, 2016 · 9625b22 · 9625b22
1 parent 53bca71
commit 9625b22
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 6 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,23 @@
+merlin 2.5.0
+============
+Mon Jun 13 22:26:33 CEST 2016
+
+  frontend:
+  - now all commands can take a context, this reduce the amount of state
+    in the command interpreter. Long term goal is to make protocol stateless
+  - merlin now supports customizable "readers": processes responsible for
+    parsing and pretty-printing. Main use-case is Reason, cppo/optcomp support
+    might be added later
+  backend:
+  - drop support for 4.00 / 4.01
+  - support for 4.03 has been added
+  - new implementation of type recovery, should diverge less from upstream
+  - support for 4.02 was reimplemented to use the same design
+  - menhir's fork has been synchronized with upstream, recovery algorithm 
+    is completely new
+  vim: add support for python3, update to new protocol
+  emacs: update to new protocol, bug fixes
+
 merlin 2.3.1
 ============
 Wed Nov 25 15:01:47 CET 2015

diff --git a/README.md b/README.md
@@ -5,12 +5,12 @@ Building and installing Merlin
 
 This README gives only indications on how to install merlin from source.
 If you want know how to install it from opam, and how to setup your environment
-to use merlin, have a look at [the wiki](https://github.com/def-lkb/merlin/wiki).
+to use merlin, have a look at [the wiki](https://github.com/the-lambda-church/merlin/wiki).
 
 Compilation
 -----------
 
-Dependencies: ocaml >= 4.00.1, ocamlfind, yojson
+Dependencies: ocaml >= 4.02.3, ocamlfind, yojson
 
     $ ./configure
     $ make

diff --git a/emacs/merlin.el b/emacs/merlin.el
@@ -5,9 +5,9 @@
 ;;         Frédéric Bour <frederic.bour(_)lakaban.net>
 ;;         Thomas Refis <thomas.refis(_)gmail.com>
 ;; Created: 18 April 2013
-;; Version: 1.4
+;; Version: 2.5
 ;; Keywords: ocaml languages
-;; URL: http://github.com/the-lambda-church/merlin
+;; URL: https://github.com/the-lambda-church/merlin
 
 ;;; Commentary:
 ;; Description:

diff --git a/opam b/opam
@@ -1,6 +1,6 @@
 opam-version: "1.2"
 name:         "merlin"
-version:      "2.3.1"
+version:      "2.5.0"
 maintainer:   "[email protected]"
 authors:      "The Merlin team"
 homepage:     "https://github.com/the-lambda-church/merlin"
@@ -17,7 +17,7 @@ depends: [
   "yojson"
 ]
 
-available: [ocaml-version >= "4.00.0"]
+available: [ocaml-version >= "4.02.3"]
 
 post-messages: [
   "merlin installed.