goto-chg - go to last edit

[dotemacs] / lisp / my-keys.el

diff --git a/lisp/my-keys.el b/lisp/my-keys.el
index 4ed7196fe92618dde148deedd5accf5d6575375f..14d9a76012d09d431523524678a83ef20fc87695 100644 (file)
--- a/lisp/my-keys.el
+++ b/lisp/my-keys.el
@@ -8,13 +8,14 @@
 (global-set-key (kbd "M-x") 'counsel-M-x)
 
 ;; Search
-(global-set-key (kbd "C-s") 'swiper)
+(global-set-key (kbd "C-s") 'counsel-grep-or-swiper)
 (global-set-key (kbd "C-r") 'ivy-resume)
 
 ;; Files/buffers
 (global-set-key (kbd "C-x C-f") 'counsel-find-file)
 (global-set-key (kbd "C-x f") 'counsel-git)
 (global-set-key (kbd "C-x g") 'counsel-git-grep)
+(global-set-key (kbd "C-x l") 'counsel-locate)
 (global-set-key (kbd "C-x c") 'my/kill-buffers-not-in-frame)
 (global-set-key (kbd "C-x C-b") 'ibuffer)
 (global-set-key (kbd "C-x C-r") 'counsel-recentf)
@@ -33,7 +34,7 @@
 (global-set-key (kbd "<C-right>") 'windmove-right)
 
 ;; Movement
-(global-set-key (kbd "M-g f") 'avy-goto-char-in-line)
+(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)
@@ -51,9 +52,10 @@
 (global-set-key (kbd "C-=") 'er/expand-region)
 (global-set-key (kbd "C-c l") 'mc/edit-lines)
 (global-set-key (kbd "C-c m") 'mc/mark-more-like-this-extended)
+(global-set-key (kbd "C-.") 'goto-last-change)
+(global-set-key (kbd "C-,") 'goto-last-change-reverse)
 
 ;; Killing and deleting
-(global-set-key (kbd "C-y") 'my/yank)
 (global-set-key (kbd "M-y") 'counsel-yank-pop)
 (global-set-key (kbd "M-z") 'zap-up-to-char)
 (global-set-key (kbd "C-c k") 'kill-whole-line)