          (suffix (cdr ident-))
          (prefix (car ident-))
          (data   (merlin/call "complete-prefix"
-                              "-position" (merlin/unmake-point (point))
+                              "-position" (merlin/unmake-point)
                               "-prefix" ident
                               "-doc" (if merlin-completion-with-doc "y" "n")))
          ;; all classic entries

  (if merlin-mode
    ;; When enabling merlin
    (progn
      (when (member major-mode '(tuareg-mode caml-mode))
	(setq merlin-guessed-favorite-caml-mode major-mode))
      (if (merlin-can-handle-buffer)
          (merlin-setup)

  (unless merlin-buffer-configuration
    (setq merlin-buffer-configuration (merlin--configuration)))
  (let ((command (merlin-lookup 'command merlin-buffer-configuration)))
    (unless command
      (setq command (if (functionp merlin-command) (funcall merlin-command)
                      merlin-command)))
    (when (equal command 'opam)
      (with-temp-buffer
        (if (eq (call-process-shell-command
