aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorÓscar Nájera <hi@oscarnajera.com>2021-03-18 17:13:07 +0100
committerÓscar Nájera <hi@oscarnajera.com>2021-03-18 17:13:07 +0100
commit0d427d45aa04a64f9fa37e1e3ac16409f4e202de (patch)
treefa53a9de06698ceec7b63fc906d0adad58259cf0
parent2f26abdd32dfc92d5313e0f1ae7db75df2f638ec (diff)
downloaddotfiles-0d427d45aa04a64f9fa37e1e3ac16409f4e202de.tar.gz
dotfiles-0d427d45aa04a64f9fa37e1e3ac16409f4e202de.tar.bz2
dotfiles-0d427d45aa04a64f9fa37e1e3ac16409f4e202de.zip
Lisps git diff
-rw-r--r--config/git/attributes5
-rw-r--r--git/global-gitconfig2
2 files changed, 6 insertions, 1 deletions
diff --git a/config/git/attributes b/config/git/attributes
index 01e819b..49b521c 100644
--- a/config/git/attributes
+++ b/config/git/attributes
@@ -1 +1,4 @@
-*.org diff=org \ No newline at end of file
+*.org diff=org
+*.lisp diff=lisp
+*.el diff=lisp
+*.scm diff=lisp \ No newline at end of file
diff --git a/git/global-gitconfig b/git/global-gitconfig
index 0131ef1..460a2b9 100644
--- a/git/global-gitconfig
+++ b/git/global-gitconfig
@@ -11,6 +11,8 @@
textconv = pdfinfo
[diff "org"]
xfuncname = "^(\\*+ +.*)$"
+[diff "lisp"]
+ xfuncname = "^[ \t]*(((;+ )|\\((cl-|el-patch-)?def(un|var|macro|method|custom|ine)).*)$"
[difftool "image_diff"]
cmd = compare $REMOTE $LOCAL png:- | montage -font Liberation-Sans -tile 3x -geometry 400x -label "reference" $LOCAL -label "diff" - -label "current--%f" $REMOTE x:
[diff]