Don't use hippie-expand

[dotemacs] / lisp / my-keys.el

diff --git a/lisp/my-keys.el b/lisp/my-keys.el
index 0de61d399000d041f4f392480cc5c74834ce593b..3dfbb9a51acbfa902f59b4164c46ce0010565cca 100644 (file)
--- a/lisp/my-keys.el
+++ b/lisp/my-keys.el
@@ -22,7 +22,6 @@
 (global-set-key (kbd "C-c g r") 'git-gutter:revert-hunk)
 
 ;; Windows/frames
-(global-set-key (kbd "C-x o") 'ace-window)
 (global-set-key (kbd "C-x 9") 'my/window-resize-mode)
 (global-set-key (kbd "<C-up>") 'windmove-up)
 (global-set-key (kbd "<C-down>") 'windmove-down)
@@ -31,12 +30,8 @@
 
 ;; Movement
 (global-set-key (kbd "M-g f") 'jump-char-forward)
-(global-set-key (kbd "M-g g") 'avy-goto-line)
-(global-set-key (kbd "M-g M-g") 'avy-goto-line)
-(global-set-key (kbd "M-g j") 'avy-goto-word-1)
 
 ;; Text formatting
-(global-set-key (kbd "M-/") 'hippie-expand)
 (global-set-key (kbd "M-;") 'comment-line)
 (global-set-key (kbd "M-i") 'change-inner)
 (global-set-key (kbd "C-o") 'my/open-line-above)
@@ -51,8 +46,6 @@
 (global-set-key (kbd "C-c m m") 'mc/mark-more-like-this-extended)
 (global-set-key (kbd "C-c m p") 'mc/mark-previous-like-this)
 (global-set-key (kbd "C-c m n") 'mc/mark-next-like-this)
-(global-set-key (kbd "C-.") 'goto-last-change)
-(global-set-key (kbd "C-,") 'goto-last-change-reverse)
 
 ;; Killing and deleting
 (global-set-key (kbd "M-z") 'zap-up-to-char)