From e216f7581b1bb5cfcd44a48d282c1c3aca3531de Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Sat, 7 Jun 2014 22:43:54 -0400 Subject: Set diff-{command,switches} My shell 'diff' is an alias for 'colordiff', so I need to point `diff-command' to 'bin/diff'. --- lisp/init-external.el | 5 +++++ 1 file changed, 5 insertions(+) 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) -- cgit v1.2.3