 (defun merlin-phrase-goto (command indice)
   "Go to the phrase indicated by COMMAND to the end INDICE.
 Returns the position."
-  (let ((r (merlin-send-command (list 'boundary command))))
-    (unless (equal r 'null)
-      (merlin-goto-point (elt r indice))
-      (point))))
+  (message "phrase: TODO"))
+  ; (let ((result (merlin-send-command (list 'boundary command))))
+  ;   (unless (equal result 'null)
+  ;     (merlin-goto-point (elt result indice))
+  ;     (point))))
 
 (defun merlin-phrase-next (&optional point)
   "Go to the beginning of the next phrase."
   (interactive)
-  (unless point (setq point (point)))
-  (merlin-sync-to-point point)
-  (cond
-    ((merlin-phrase-goto 'next 0))
-    ((progn (merlin-tell-definitions 2)
-            (goto-char (merlin-seek-exact point))
-            (merlin-phrase-goto 'next 0)))
-    (t (goto-char (point-max)))))
+  (message "phrase: TODO"))
+  ; (unless point (setq point (point)))
+  ; (merlin-sync-to-point point)
+  ; (cond
+  ;   ((merlin-phrase-goto 'next 0))
+  ;   ((progn (merlin-tell-definitions 2)
+  ;           (goto-char (merlin-seek-exact point))
+  ;           (merlin-phrase-goto 'next 0)))
+  ;   (t (goto-char (point-max)))))
 
 (defun merlin-phrase-prev ()
   "Go to the beginning of the previous phrase."
   (interactive)
-  (let ((point (point)))
-    (merlin-sync-to-point)
-    (if (equal point (merlin-phrase-goto 'current 0))
-        (merlin-phrase-goto 'prev 0))))
+  (message "phrase: TODO"))
+  ; (let ((point (point)))
+  ;   (merlin-sync-to-point)
+  ;   (if (equal point (merlin-phrase-goto 'current 0))
+  ;       (merlin-phrase-goto 'prev 0))))
 
 (defun merlin-to-point ()
   "Update merlin to the current point, reporting errors."

(defun merlin-locate-pure (ident)
  "Locate the identifier IDENT at point."
  (merlin-sync-to-point)
  (let* ((r (merlin-send-command
             (list 'locate (substring-no-properties ident)
                   'at (merlin-unmake-point (point))))))
    (if (and r (listp r))
        (merlin-goto-file-and-point r)
      (message "%s not found." ident))))

(defun merlin-locate ()

             (merlin-sync-lock-zone-display))))

(defun merlin-sync-to-point (&optional point)
  "First do a merlin-tell-to-point then update lock zone display.
FIXME: there is less structural meaning in lock-zone with new merlin, what should we do?"
  (merlin-tell-to-point point)
  (merlin-sync-lock-zone-display))

;;;;;;;;;;;;;;;;;;
