     (if (not end-p)
         (merlin-send-command "tell" '("end" nil)))
     (if view-errors-p
-        (merlin-check-for-errors view-errors-p)
-      (progn
-        (merlin-seek orig-point))
-        (merlin-check-for-errors view-errors-p)
-        (merlin-seek (point) "end"))
+        (merlin-check-for-errors view-errors-p))
     (setq merlin-lock-point (merlin-get-position))
     (merlin-update-lock-zone-display)))
 

	 (forward-line 10))
       (merlin-tell-piece mode temp end))))

(defun merlin-tell-till-end-of-phrase (orig-point view-errors-p)
  "Tell merlin the buffer until the end of the current phrase is met.
It proceeds by telling (with the end mode) each line until it
returns true or until we are at the end of the buffer.  It then

(defun merlin-completion-at-point ()
  "Perform completion at point with merlin."
  (save-excursion
    (skip-syntax-backward "w_.")
    (let ((start (point)))
      (skip-syntax-forward "w_.")
