Commit 1d5eeb64 authored by Paul Eggert's avatar Paul Eggert
Browse files

Update .gitattributes to match sources better

* .gitattributes: Remove nt/nmake.defs.  Move dostorture.c, c.C,
algrthms.html.  Use pattern for todo-mode.  Improve patterns for
Ada, C, ObjC, shell.  Add Pascal.  Remove unused pattern *.ruby.
Add config.guess and config.sub as shell files.
parent 75b84929
...@@ -24,15 +24,12 @@ admin/charsets/mapfiles/PTCP154 whitespace=cr-at-eol ...@@ -24,15 +24,12 @@ admin/charsets/mapfiles/PTCP154 whitespace=cr-at-eol
leim/MISC-DIC/cangjie-table.b5 whitespace=cr-at-eol leim/MISC-DIC/cangjie-table.b5 whitespace=cr-at-eol
leim/MISC-DIC/cangjie-table.cns whitespace=cr-at-eol leim/MISC-DIC/cangjie-table.cns whitespace=cr-at-eol
leim/MISC-DIC/pinyin.map whitespace=cr-at-eol leim/MISC-DIC/pinyin.map whitespace=cr-at-eol
nt/nmake.defs whitespace=cr-at-eol test/manual/etags/c-src/dostorture.c whitespace=cr-at-eol
test/etags/c-src/dostorture.c whitespace=cr-at-eol test/manual/etags/cp-src/c.C whitespace=cr-at-eol
test/etags/cp-src/c.C whitespace=cr-at-eol test/manual/etags/html-src/algrthms.html whitespace=cr-at-eol
test/etags/html-src/algrthms.html whitespace=cr-at-eol
# The todo-mode file format includes trailing whitespace, so the test # The todo-mode file format includes trailing whitespace.
# data files cannot avoid it. *.tod[aorty] -whitespace=blank-at-eol
test/lisp/calendar/todo-mode-resources/todo-test-1.toda -whitespace=blank-at-eol
test/lisp/calendar/todo-mode-resources/todo-test-1.todo -whitespace=blank-at-eol
# The upstream maintainer does not want to remove trailing whitespace. # The upstream maintainer does not want to remove trailing whitespace.
doc/misc/texinfo.tex -whitespace=blank-at-eol doc/misc/texinfo.tex -whitespace=blank-at-eol
...@@ -52,23 +49,23 @@ doc/misc/texinfo.tex -whitespace=blank-at-eol ...@@ -52,23 +49,23 @@ doc/misc/texinfo.tex -whitespace=blank-at-eol
etc/e/eterm-color binary etc/e/eterm-color binary
# Git's builtin diff hunk header styles. # Git's builtin diff hunk header styles.
*.ada diff=ada *.ad[abs] diff=ada
*.[ch] diff=cpp *.[Cch] diff=cpp
*.cc diff=cpp *.cc diff=cpp
*.cpp diff=cpp *.[ch]pp diff=cpp
*.hh diff=cpp *.hh diff=cpp
*.for diff=fortran *.for diff=fortran
*.html diff=html *.html diff=html
*.shtml diff=html *.shtml diff=html
*.xml diff=html *.xml diff=html
*.java diff=java *.java diff=java
*.m diff=objc *.[HMm] diff=objc
*.pas diff=pascal
*.perl diff=perl *.perl diff=perl
*.pl diff=perl *.pl diff=perl
*.php diff=php *.php diff=php
*.py diff=python *.py diff=python
*.rb diff=ruby *.rb diff=ruby
*.ruby diff=ruby
*.tex diff=tex *.tex diff=tex
# Hooks for non-default diff hunk headers; see autogen.sh. # Hooks for non-default diff hunk headers; see autogen.sh.
...@@ -78,7 +75,7 @@ etc/e/eterm-color binary ...@@ -78,7 +75,7 @@ etc/e/eterm-color binary
*.mk diff=make *.mk diff=make
*[Mm]akefile diff=make *[Mm]akefile diff=make
Makefile.in diff=make Makefile.in diff=make
*.sh diff=shell *[-.]sh diff=shell
*.texi diff=texinfo *.texi diff=texinfo
# #
# Diff hunk header special-case file names. # Diff hunk header special-case file names.
...@@ -91,6 +88,8 @@ admin/merge-pkg-config diff=shell ...@@ -91,6 +88,8 @@ admin/merge-pkg-config diff=shell
admin/quick-install-emacs diff=shell admin/quick-install-emacs diff=shell
admin/update-copyright diff=shell admin/update-copyright diff=shell
admin/update_autogen diff=shell admin/update_autogen diff=shell
build-aux/config.guess diff=shell
build-aux/config.sub diff=shell
build-aux/git-hooks/commit-msg diff=shell build-aux/git-hooks/commit-msg diff=shell
build-aux/git-hooks/pre-commit diff=shell build-aux/git-hooks/pre-commit diff=shell
build-aux/gitlog-to-emacslog diff=shell build-aux/gitlog-to-emacslog diff=shell
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment