From c881813d45bf239676ea0acf7aee399ebbcbf893 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Sun, 14 Apr 2024 14:42:24 +0200 Subject: Improve diffing for Common and Emacs Lisps --- user/settings/emacs.nix | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'user/settings/emacs.nix') diff --git a/user/settings/emacs.nix b/user/settings/emacs.nix index 2871173c..92ba39e2 100644 --- a/user/settings/emacs.nix +++ b/user/settings/emacs.nix @@ -27,6 +27,13 @@ in ../modules/eshell.nix ]; + programs.git.attributes = [ + "*.el diff=elisp" + ]; + programs.git.extraConfig."diff.elisp" = { + xfuncname = "^\\((((def\\S+)|use-package)\\s+\\S+)"; + }; + programs.emacs = { enable = true; package = lib.mkDefault (pkgs.emacs29.override { withGTK3 = true; }); -- cgit 1.4.1