diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-03-13 12:20:01 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-03-13 12:58:30 -0700 |
| commit | 181e92c4e060a7ce4740b561375f9ec9f473f144 (patch) | |
| tree | 6d0688109d99ac387e1f6739323862c85d4b26ed /autogen.sh | |
| parent | 32a4d2ee2c1a1a8f157ebb2e9b62bc53e74cf4f8 (diff) | |
| download | emacs-181e92c4e060a7ce4740b561375f9ec9f473f144.tar.gz | |
Improve diff hunk headers when maintaining Emacs
* .gitattributes: Improve diff hunk header support for makefiles,
shell scripts, Ada, C, C++, Objective C, HTML, SHTML, XML, Java,
Perl, PHP, Python, Ruby, and TeX, all of which are used in Emacs
somewhere (sometimes just in test cases).
* autogen.sh: Add regexes for makefiles and shell scripts.
Diffstat (limited to 'autogen.sh')
| -rwxr-xr-x | autogen.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/autogen.sh b/autogen.sh index ac728ccd521..904246509fa 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:]][^,]+)' |