 
 (defun merlin-get-completion (ident)
   "Returns the completion for ident `ident'"
-  (merlin-send-command "complete" (list "prefix" ident)))
+  (merlin-send-command "complete" (list "prefix" ident "at" (merlin-unmake-point (point)))))
 
 (defun merlin-tell-string (mode string)
   "Tell a string to merlin using `mode'"

;; Get the type of an element"
(defun merlin-trim (s)
  (replace-regexp-in-string "\n\\'" "" s))
(defun merlin-type-of-expression (exp)
  "Get the type of an expression"
  (let ((ans (merlin-send-command "type" (list "expression" exp))))
    (if (string-equal (elt ans 0) "return")
	(elt ans 1)
      nil)))
  
(defun merlin-show-type (name typ)
  "Show the given type. If typ is nil, nothing is done"
  (if typ

	     (not (eq (point) merlin-idle-point)))
	(progn
	  (merlin-show-type-of-point-quiet)
	  (message "OK")
	  (setq merlin-idle-point (point))))))

;; Mode definition
