 ;; TYPE ENCLOSING
 (defun merlin--type-enclosing-query ()
   "Get the enclosings around point from merlin and sets MERLIN-ENCLOSING-TYPES."
-  (let* (; deprecated, leave merlin compute the identifier
-         ; (bounds (bounds-of-thing-at-point 'ocaml-atom))
-         ; (start  (if bounds (car bounds) (point)))
-         ; (end    (if bounds (cdr bounds) (point)))
-         ; (string (if bounds (merlin--buffer-substring start end) ""))
-         ; (fallback (list (cons 'assoc nil)
-         ;                 (cons 'expr string)
-         ;                 (cons 'offset (- (point) start))))
-         (types (merlin-send-command (list 'type 'enclosing 'at (merlin-unmake-point (point)))
+  (let* ((types (merlin-send-command (list 'type 'enclosing 'at (merlin-unmake-point (point)))
                                      (lambda (exn) '(nil))))
          (list (mapcar (lambda (obj)
                          (let* ((tail (cdr (assoc 'tail obj)))

                 'at (merlin-unmake-point (point)))
           callback-if-success callback-if-exn)))

(defun merlin-type-display-in-buffer (text)
  "Change content of type-buffer."
  (with-current-buffer (get-buffer-create merlin-type-buffer-name)
     (when (member major-mode '(nil fundamental-mode))

  "Show the type of the region."
  (lexical-let*
      ((substring (merlin--buffer-substring (region-beginning) (region-end)))
       (on-success (lambda (type) (merlin--type-display nil type nil)))
       (on-error   (lambda (err)
                     (let ((msg (assoc 'message err))
                           (typ (assoc 'type err)))
