;; Mode switching
(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 "C-c g g") 'magit-dispatch)
+(global-set-key (kbd "C-c g f") 'magit-file-dispatch)
(global-set-key (kbd "<f8>") 'flyspell-mode)
(global-set-key (kbd "<f9>") 'whitespace-mode)
(global-set-key (kbd "<f10>") 'toggle-truncate-lines)