emacs: remove keybindings reserved to users ( fix #170 )

ocaml · Feb 12, 2014 · 8956069 · 8956069
1 parent d2234e7
commit 8956069
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/emacs/merlin.el b/emacs/merlin.el
@@ -1199,8 +1199,6 @@ Returns the position."
         (merlin-menu-map (make-sparse-keymap))
         (merlin-show-type-map (make-sparse-keymap)))
     (define-key merlin-map (kbd "C-c <C-return>") 'merlin-to-point)
-    (define-key merlin-map (kbd "C-c l") 'merlin-use)
-    (define-key merlin-map (kbd "C-c r") 'merlin-restart-process)
     (define-key merlin-map (kbd "C-c C-x") 'merlin-error-next)
     (define-key merlin-map (kbd "C-c C-l") 'merlin-locate)
     (when (featurep 'auto-complete)
@@ -1209,7 +1207,6 @@ Returns the position."
     (define-key merlin-map (kbd "C-c C-r") 'merlin-rewind)
     (define-key merlin-map (kbd "C-c C-u") 'merlin-refresh)
     (define-key merlin-map (kbd "C-c TAB") 'merlin-try-completion)
-    (define-key merlin-map (kbd "C-c t") 'merlin-type-expr)
     (define-key merlin-map (kbd "C-c C-t") 'merlin-type-enclosing)
     (define-key merlin-map (kbd "C-<up>") 'merlin-type-enclosing-go-up)
     (define-key merlin-map (kbd "C-<down>") 'merlin-type-enclosing-go-down)