summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2014-06-07 22:43:54 -0400
committerKyle Meyer <kyle@kyleam.com>2014-06-07 22:43:54 -0400
commite216f7581b1bb5cfcd44a48d282c1c3aca3531de (patch)
tree696f890f9ab6eedc2a9d127f6c0f797505fc25c8
parent2a1419f623c510699dd5a8cf3c2dfb5ef9acf022 (diff)
downloademacs.d-e216f7581b1bb5cfcd44a48d282c1c3aca3531de.tar.gz
Set diff-{command,switches}
My shell 'diff' is an alias for 'colordiff', so I need to point `diff-command' to 'bin/diff'.
-rw-r--r--lisp/init-external.el5
1 files changed, 5 insertions, 0 deletions
diff --git a/lisp/init-external.el b/lisp/init-external.el
index 1c5a0bb..7a7d5ea 100644
--- a/lisp/init-external.el
+++ b/lisp/init-external.el
@@ -65,4 +65,9 @@ is non-nil, switch to the buffer."
;; Give frequently-used recompile a shorter binding.
(global-set-key (kbd "C-c g") 'recompile)
+;;; Diff
+
+(setq diff-command "/bin/diff"
+ diff-switches "-u")
+
(provide 'init-external)