summaryrefslogtreecommitdiffstats
path: root/emacs
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2023-02-05 00:05:03 -0500
committerDavid Robillard <d@drobilla.net>2023-02-05 00:05:03 -0500
commit1bbfa94847df49a28d69463cb2fa34c2b4bd0b10 (patch)
treeacd0b3e72480d0f4cb22f2ad74c5448b5d609760 /emacs
parent5844e63cc603ddbc30aa8558ed9290d9e8b55933 (diff)
downloaddotfiles-1bbfa94847df49a28d69463cb2fa34c2b4bd0b10.tar.gz
dotfiles-1bbfa94847df49a28d69463cb2fa34c2b4bd0b10.tar.bz2
dotfiles-1bbfa94847df49a28d69463cb2fa34c2b4bd0b10.zip
Fix magit and other diff functionality on Windows
Diffstat (limited to 'emacs')
-rw-r--r--emacs/.emacs.d/init.el3
1 files changed, 3 insertions, 0 deletions
diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index aec45aa..a962927 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -328,6 +328,9 @@
'(window-divider-mode t)
'(winner-mode t))
+(if (eq system-type 'windows-nt)
+ (setq diff-command "C:/Program Files/Git/usr/bin/diff.exe"))
+
(setq ring-bell-function
(lambda ()
(let ((orig-fg (face-foreground 'mode-line)))