summaryrefslogtreecommitdiff
path: root/accounts/gkleen@sif/emacs.el
diff options
context:
space:
mode:
Diffstat (limited to 'accounts/gkleen@sif/emacs.el')
-rw-r--r--accounts/gkleen@sif/emacs.el6
1 files changed, 4 insertions, 2 deletions
diff --git a/accounts/gkleen@sif/emacs.el b/accounts/gkleen@sif/emacs.el
index 7a8eb8f5..b1b1b198 100644
--- a/accounts/gkleen@sif/emacs.el
+++ b/accounts/gkleen@sif/emacs.el
@@ -38,6 +38,8 @@
38 38
39(evil-set-undo-system 'undo-tree) 39(evil-set-undo-system 'undo-tree)
40 40
41(add-hook 'magit-mode-hook (lambda () (magit-delta-mode +1)))
42
41(global-set-key (kbd "RET") 'newline-and-indent) 43(global-set-key (kbd "RET") 'newline-and-indent)
42(global-set-key (kbd "M-g") 'magit-status) 44(global-set-key (kbd "M-g") 'magit-status)
43(global-set-key (kbd "M-?") 'vc-git-grep) 45(global-set-key (kbd "M-?") 'vc-git-grep)
@@ -54,8 +56,8 @@
54 56
55(global-set-key (kbd "C-x K") 'kill-current-buffer) 57(global-set-key (kbd "C-x K") 'kill-current-buffer)
56 58
57(setq backup-directory-alist `(("." . "~/.saves"))) 59(setq backup-directory-alist `(("." . "~/.local/state/emacs/saves")))
58(setq undo-tree-history-directory-alist `(("." . "~/.undo"))) 60(setq undo-tree-history-directory-alist `(("." . "~/.local/state/emacs/undo")))
59(setq delete-old-versions t 61(setq delete-old-versions t
60 kept-new-versions 6 62 kept-new-versions 6
61 kept-old-versions 2 63 kept-old-versions 2