summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.emacs8
-rw-r--r--.emacs-custom.el1
2 files changed, 9 insertions, 0 deletions
diff --git a/.emacs b/.emacs
index f55093c..7d3e54d 100644
--- a/.emacs
+++ b/.emacs
@@ -156,6 +156,13 @@
"Keymap for toggling editing features."
'(("f" auto-fill-mode)))
+(my/define-prefix-command my/magit-map
+ "Keymap for Magit commands."
+ '(("c" magit-file-dispatch)
+ ("f" magit-find-file)
+ ("g" magit-status)
+ ("x" magit-dispatch)))
+
(my/define-prefix-command my/input-map
"Keymap for input methods shortcuts."
`(("t" ,(my/make-input-toggle TeX))
@@ -189,6 +196,7 @@
(global-set-key (kbd "C-c c") 'compile)
(global-set-key (kbd "C-c d") 'my/display-map)
(global-set-key (kbd "C-c e") 'my/editing-map)
+(global-set-key (kbd "C-c g") 'my/magit-map)
(global-set-key (kbd "C-c i") 'my/input-map)
(global-set-key (kbd "C-c k") 'my/kill-map)
(global-set-key (kbd "C-c m") 'my/manual-map)
diff --git a/.emacs-custom.el b/.emacs-custom.el
index 4a16bef..bc23047 100644
--- a/.emacs-custom.el
+++ b/.emacs-custom.el
@@ -53,6 +53,7 @@
'(isearch-lazy-count t)
'(line-number-display-limit-width 2000)
'(lua-indent-level 2)
+ '(magit-define-global-key-bindings nil)
'(magit-diff-refine-hunk t)
'(magit-ediff-dwim-show-on-hunks t)
'(magit-log-arguments '("--graph" "--color" "--decorate" "-n256"))