direx with popwin

[dotemacs] / lisp / my-keys.el

diff --git a/lisp/my-keys.el b/lisp/my-keys.el
index 4af81c490907c56d3449d59ebb7e61437f583ff8..9885cf9a863e3b333fc6acde6befd12d41fa74db 100644 (file)
--- a/lisp/my-keys.el
+++ b/lisp/my-keys.el
@@ -10,10 +10,9 @@
 
 ;; Files/buffers
 (global-set-key (kbd "C-x C-f") 'counsel-find-file)
-(global-set-key (kbd "C-x f") 'counsel-find-file)
-(global-set-key (kbd "C-c f") 'counsel-git)
-(global-set-key (kbd "C-c g") 'counsel-git-grep)
-(global-set-key (kbd "C-x C-k") 'my/kill-buffers-not-in-frame)
+(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 k") 'my/kill-buffers-not-in-frame)
 (global-set-key (kbd "C-x C-b") 'ibuffer)
 (global-set-key (kbd "C-x C-r") 'ivy-recentf)
 
@@ -28,7 +27,7 @@
 
 ;; Text formatting
 (global-set-key (kbd "M-/") 'hippie-expand)
-(global-set-key (kbd "M-;") 'toggle-comment-on-line)
+(global-set-key (kbd "M-;") 'my/toggle-comment-on-line)
 (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)
@@ -44,6 +43,7 @@
 (global-set-key (kbd "M-z") 'zap-up-to-char)
 
 ;; Mode switching
+(global-set-key (kbd "C-x C-j") 'direx:jump-to-directory-other-window)
 (global-set-key (kbd "<f8>") 'flyspell-mode)
 (global-set-key (kbd "<f9>") 'whitespace-mode)
 (global-set-key (kbd "<f10>") 'toggle-truncate-lines)