X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/b50a20709f8ec549c18b8dd8665f6f61ee151c82..1aebe99145e9ef612cdb272800904e3ba9297196:/autogen.sh

diff --git a/autogen.sh b/autogen.sh
index ac728ccd52..2e10a77cb3 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -281,6 +281,11 @@ git_config transfer.fsckObjects true
 
 git_config diff.elisp.xfuncname \
 	   '^\(def[^[:space:]]+[[:space:]]+([^()[:space:]]+)'
+git_config 'diff.m4.xfuncname' '^((m4_)?define|A._DEFUN(_ONCE)?)\([^),]*'
+git_config 'diff.make.xfuncname' \
+	   '^([$.[:alnum:]_].*:|[[:alnum:]_]+[[:space:]]*([*:+]?[:?]?|!?)=|define .*)'
+git_config 'diff.shell.xfuncname' \
+	   '^([[:space:]]*[[:alpha:]_][[:alnum:]_]*[[:space:]]*\(\)|[[:alpha:]_][[:alnum:]_]*=)'
 git_config diff.texinfo.xfuncname \
 	   '^@node[[:space:]]+([^,[:space:]][^,]+)'
 
@@ -325,7 +330,7 @@ fi
 
 if test ! -f configure; then
     echo "You can now run '$0 autoconf'."
-elif test -d .git && test $git_was_ok = false && test $do_git = false; then
+elif test -e .git && test $git_was_ok = false && test $do_git = false; then
     echo "You can now run '$0 git'."
 elif test ! -f config.status ||
 	test -n "`find src/stamp-h.in -newer config.status`"; then