           (candidates
            (merlin-sync-to-point)
            (mapcar #'(lambda (x) (propertize (car x) 'merlin-meta (cadr x)))
-                   (merlin-completion-data arg)))
+                   (merlin--completion-data arg)))
           (post-completion
             (let ((minibuffer-message-timeout nil))
               (minibuffer-message "%s : %s" arg (get-text-property 0 'merlin-meta arg))))

  :group 'merlin :type '(choice (file :tag "Filename")
                                (const :tag "Use current opam switch" opam)))


(defcustom merlin-completion-types t
  "If non-nil, print the types of the variables during completion with `auto-complete'."

(defun merlin-auto-complete-candidates ()
  "Return the candidates for auto-completion with
  auto-complete. If the cache is wrong then recompute it."
  (if (not (and (equal (merlin--completion-prefix ac-prefix) merlin-ac-prefix)
                (string-prefix-p merlin-ac-ac-prefix ac-prefix)))
      (merlin-ac-source-refresh-cache))
  merlin-ac-cache)
