mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-11-24 07:20:37 +00:00
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.
This commit is contained in:
parent
32a4d2ee2c
commit
181e92c4e0
46
.gitattributes
vendored
46
.gitattributes
vendored
@ -47,6 +47,52 @@ doc/misc/texinfo.tex -whitespace=blank-at-eol
|
||||
*.tiff binary
|
||||
etc/e/eterm-color binary
|
||||
|
||||
# Git's builtin diff hunk header styles.
|
||||
*.ada diff=ada
|
||||
*.[ch] diff=cpp
|
||||
*.cc diff=cpp
|
||||
*.cpp diff=cpp
|
||||
*.hh diff=cpp
|
||||
*.for diff=fortran
|
||||
*.html diff=html
|
||||
*.shtml diff=html
|
||||
*.xml diff=html
|
||||
*.java diff=java
|
||||
*.m diff=objc
|
||||
*.perl diff=perl
|
||||
*.pl diff=perl
|
||||
*.php diff=php
|
||||
*.py diff=python
|
||||
*.rb diff=ruby
|
||||
*.ruby diff=ruby
|
||||
*.tex diff=tex
|
||||
|
||||
# Hooks for non-default diff hunk headers; see autogen.sh.
|
||||
*.el diff=elisp
|
||||
*.ac diff=m4
|
||||
*.m4 diff=m4
|
||||
*.mk diff=make
|
||||
*[Mm]akefile diff=make
|
||||
Makefile.in diff=make
|
||||
*.sh diff=shell
|
||||
*.texi diff=texinfo
|
||||
#
|
||||
# Diff hunk header special-case file names.
|
||||
admin/build-configs diff=perl
|
||||
admin/charsets/mapconv diff=shell
|
||||
admin/diff-tar-files diff=shell
|
||||
admin/make-emacs diff=perl
|
||||
admin/merge-gnulib diff=shell
|
||||
admin/merge-pkg-config diff=shell
|
||||
admin/quick-install-emacs diff=shell
|
||||
admin/update-copyright diff=shell
|
||||
admin/update_autogen diff=shell
|
||||
build-aux/git-hooks/commit-msg diff=shell
|
||||
build-aux/git-hooks/pre-commit diff=shell
|
||||
build-aux/gitlog-to-emacslog diff=shell
|
||||
build-aux/make-info-dir diff=shell
|
||||
build-aux/move-if-change diff=shell
|
||||
build-aux/msys-to-w32 diff=shell
|
||||
build-aux/update-subdirs diff=shell
|
||||
lib-src/rcs2log diff=shell
|
||||
/make-dist diff=shell
|
||||
|
@ -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:]][^,]+)'
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user