smarter yank

[dotemacs] / lisp / my-keys.el

diff --git a/lisp/my-keys.el b/lisp/my-keys.el
index fb33ded1963208f130568ed92bb506adf39689da..29c9f1e2c2ec4882e94c6cc6837e4923e60d14ff 100644 (file)
--- a/lisp/my-keys.el
+++ b/lisp/my-keys.el
@@ -32,15 +32,18 @@
 
 ;; 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 M-g") 'avy-goto-line)
 
 ;; Text formatting
 (global-set-key (kbd "M-/") 'hippie-expand)
-(global-set-key (kbd "M-;") 'my/toggle-comment-on-line)
+(global-set-key (kbd "M-;") 'my/comment-dwim)
 (global-set-key (kbd "M-i") 'change-inner)
 (global-set-key (kbd "C-o") 'my/open-line-above)
 (global-set-key (kbd "M-o") 'my/open-line-below)
+(global-set-key (kbd "C-c c") 'my/copy-line)
+(global-set-key (kbd "C-c d") 'my/duplicate-line)
 
 ;; Marking
 (global-set-key (kbd "C-=") 'er/expand-region)
@@ -48,9 +51,11 @@
 (global-set-key (kbd "C-c m") 'mc/mark-more-like-this-extended)
 
 ;; 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-_") 'my/copy-line)
 (global-set-key (kbd "M-z") 'zap-up-to-char)
+(global-set-key (kbd "C-c k") 'kill-whole-line)
+(global-set-key (kbd "C-c s") 'my/substitute-line)
 
 ;; Mode switching
 (global-set-key (kbd "C-x C-j") 'direx-project:jump-to-project-root-other-window)