avy jump key binding improvements

[dotemacs] / lisp / my-keys.el

diff --git a/lisp/my-keys.el b/lisp/my-keys.el
index e0f0ec9aa534e9f185ee1edff171b94abc81bb61..7bb45ce6aa6060bdeb39da302014083122137694 100644 (file)
--- a/lisp/my-keys.el
+++ b/lisp/my-keys.el
@@ -22,6 +22,7 @@
 (global-set-key (kbd "C-c g d") 'git-gutter:popup-hunk)
 (global-set-key (kbd "C-c g p") 'git-gutter:previous-hunk)
 (global-set-key (kbd "C-c g n") 'git-gutter:next-hunk)
+(global-set-key (kbd "C-c g r") 'git-gutter:revert-hunk)
 
 ;; Windows/frames
 (global-set-key (kbd "<C-up>") 'windmove-up)
@@ -30,10 +31,10 @@
 (global-set-key (kbd "<C-right>") 'windmove-right)
 
 ;; Movement
-(global-set-key (kbd "M-g M-j") 'avy-goto-char-timer)
-(global-set-key (kbd "M-g M-l") 'avy-goto-char-in-line)
-(global-set-key (kbd "M-g M-w") 'avy-goto-word-1)
+(global-set-key (kbd "M-g f") 'avy-goto-char-in-line)
+(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)
@@ -60,6 +61,7 @@
 (global-set-key (kbd "C-x C-j") 'direx-project:jump-to-project-root-other-window)
 (global-set-key (kbd "C-c g s") 'magit-status)
 (global-set-key (kbd "C-c g g") 'magit-dispatch-popup)
+(global-set-key (kbd "C-c g f") 'magit-file-popup)
 (global-set-key (kbd "<f8>") 'flyspell-mode)
 (global-set-key (kbd "<f9>") 'whitespace-mode)
 (global-set-key (kbd "<f10>") 'toggle-truncate-lines)