     (setq merlin-enclosing-offset (1- merlin-enclosing-offset))
     (merlin-type-enclosing-go)))
 
-
 (defvar merlin-type-enclosing-map
   (let ((keymap (make-sparse-keymap)))
-    (define-key keymap (kbd "<up>") 'up)
-    (define-key keymap (kbd "[up]") 'up)
-    (define-key keymap (kbd "<down>") 'down)
-    (define-key keymap (kbd "[down]") 'down)
+    (define-key keymap (kbd "<up>") 'merlin-type-enclosing-go-up)
+    (define-key keymap (kbd "<down>") 'merlin-type-enclosing-go-down)
     keymap)
   "The local map to navigate type enclosing.")
 

  "Locate the identifier under point"
  (interactive)
  (let ((ident (thing-at-point 'ocaml-atom)))
    (when ident 
      (merlin-locate-pure ident)
      (if merlin-type-after-locate
          (merlin-type-enclosing)))))

             (version (replace-regexp-in-string "\n$" "" version)))
        (message "%s (from shell)" version))
    (message "%s" (merlin-send-command '(version)))))

;;;;;;;;;;;;;;;;
;; MODE SETUP ;;
