     (define-key merlin-menu-map [separator]
       '("-"))
     (define-key merlin-show-type-map [local]
-      '(menu-item "around the cursor" merlin-magic-show-type
+      '(menu-item "around the cursor" merlin-show-type
                   :help "Show the type of the smallest subexpression near cursor"))
     (define-key merlin-show-type-map [region]
       '(menu-item "of the region" merlin-show-type-of-region

  "Go to the point indicated by `DATA' which must be an assoc list with fields line and col"
  (goto-char (point-min))
  (forward-line (1- (cdr (assoc 'line data))))
  (forward-char (cdr (assoc 'col data)))
)
(defun merlin-goto-file-and-point (data &optional same-buffer-force)
  "Go to the file and position indicated by DATA which is an assoc list containing fields file, line and col.
If SAME-BUFFER-FORCE is non-nil, create a new window even if it is the same buffer."


(merlin-insinuate)

(provide 'merlin2)
;;; merlin.el ends here