summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.emacs.d/etc/custom.el16
1 files changed, 12 insertions, 4 deletions
diff --git a/.emacs.d/etc/custom.el b/.emacs.d/etc/custom.el
index 34cc306..bc35784 100644
--- a/.emacs.d/etc/custom.el
+++ b/.emacs.d/etc/custom.el
@@ -9,8 +9,11 @@
'(company-dabbrev-ignore-case nil)
'(company-minimum-prefix-length 1)
'(company-selection-wrap-around t)
+ '(ediff-split-window-function 'split-window-horizontally t)
+ '(ediff-window-setup-function 'ediff-setup-windows-plain t)
'(eshell-hist-ignoredups t)
'(eshell-input-filter 'eshell-input-filter-initial-space)
+ '(flycheck-mode-line-prefix "flyc")
'(ibuffer-formats
'((mark modified read-only locked " "
(name 18 18 :left :elide)
@@ -21,7 +24,7 @@
" " filename-and-process)
(mark " "
(name 16 -1)
- " " filename)) t)
+ " " filename)))
'(ibuffer-saved-filter-groups
'(("default"
("dired"
@@ -55,6 +58,7 @@
(mode . scheme-mode)
(mode . haskell-mode)
(mode . lean-mode)
+ (mode . go-mode)
(mode . alloy-mode)))
("tex"
(or
@@ -65,14 +69,18 @@
(name . "^\\*scratch\\*$")
(name . "^\\*Messages\\*$")))
("erc"
- (mode . erc-mode)))) t)
- '(ls-lisp-dirs-first t t)
+ (mode . erc-mode)))))
+ '(ls-lisp-dirs-first t)
+ '(magit-display-buffer-function 'magit-display-buffer-fullframe-status-v1)
'(org-agenda-files
'("~/usr/org/todos/personal.org" "~/usr/org/todos/masters.org"))
'(org-agenda-start-on-weekday 0 t)
'(org-latex-packages-alist '(("" "listings") ("" "color")))
'(safe-local-variable-values
- '((eval require 'org-ref)
+ '((eval modify-syntax-entry 43 "'")
+ (eval modify-syntax-entry 36 "'")
+ (eval modify-syntax-entry 126 "'")
+ (eval require 'org-ref)
(eval when
(featurep 'typo
(typo-mode -1)))