Merge branch 'master' of git.distorted.org.uk:~mdw/public-git/profile

* 'master' of git.distorted.org.uk:~mdw/public-git/profile:
  dot/screenrc: Turn off XON/XOFF flow control.
  dot/ercrc.el: New IRC server at Good HSTG.
  dot/ercrc.el: Rearrange bot greeting.
  el/dot-emacs.el: Nicer colours for Emacs w3m mode.

diff --git a/dot/gitconfig.in b/dot/gitconfig.in
index e53b153d4cbcb447eee5952d9ae1aae352b2abb5..106e2a985485ac7951139f77063e0deb742509e9 100644 (file)
--- a/dot/gitconfig.in
+++ b/dot/gitconfig.in
@@ -4,6 +4,7 @@
 [core]
        filemode = true
        excludesfile = @profile@/git/gitignore
+       attributesfile = @profile@/git/attributes
 
 [user]
        name = Mark Wooding
@@ -22,7 +23,7 @@
        wordRegex = [[:alnum:]]+|[^[:space:][:alnum:]]
 
 [diff "lisp"]
-       xfuncname = "^\\s*\\(def.*$"
+       xfuncname = "^((\\(|\\s*\\(def).*$)"
 
 [log]
        date = rfc

diff --git a/git/attributes b/git/attributes
new file mode 100644 (file)
index 0000000..1bbda79
--- /dev/null
+++ b/git/attributes
@@ -0,0 +1,5 @@
+### -*-conf-*-
+
+*.el           diff=lisp
+.emacs         diff=lisp
+*.lisp         diff=lisp