From 0e4432d19e95454130f2e122a35aaa77285e67f9 Mon Sep 17 00:00:00 2001
From: Dani Dickstein <daniel.dickstein@gmail.com>
Date: Mon, 20 Dec 2021 12:40:32 -0500
Subject: [PATCH] Update changelog for PR #1219

---
 CHANGES.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 43ad6de569..3512aaef1c 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -5,6 +5,8 @@ git version
     - filter dups in source paths (#1218)
     - improve load path performance (#1323)
     - fix handlink of ppx's under Windows (#1413)
+    - locate: look for original source files before looking for preprocessed
+      files (#1219 by @ddickstein, fixes #894)
 
 merlin 4.4
 ==========
@@ -147,7 +149,7 @@ Tue Feb  2 03:13:37 PM CET 2021
     - emacs: add missing mandatory argument for define-obsolete-function-alias
       (#1250, by Atharva Shukla, fixes #1234)
     - emacs: use "opam var" instead of "opam config var" (#1249, by Raja Boujbel)
-    - vim: fix CursorMoved semantics (#1213, by Daniel Dickstein)
+    - vim: fix CursorMoved semantics (#1213, by @ddickstein)
     - vim: add :MerlinLocateImpl and :MerlinLocateIntf (#1208 by Matthew Ryan)
   + test suite
     - replace mdx usage by dune's cram mechanism