[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 1d5eeb6 1/2: Update .gitattributes to match sources
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] master 1d5eeb6 1/2: Update .gitattributes to match sources better |
Date: |
Tue, 30 May 2017 11:29:40 -0400 (EDT) |
branch: master
commit 1d5eeb64da5a8b133c559bb01a9e659255a55af4
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>
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.
---
.gitattributes | 27 +++++++++++++--------------
1 file changed, 13 insertions(+), 14 deletions(-)
diff --git a/.gitattributes b/.gitattributes
index 7e35433..d523e13 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -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.cns whitespace=cr-at-eol
leim/MISC-DIC/pinyin.map whitespace=cr-at-eol
-nt/nmake.defs whitespace=cr-at-eol
-test/etags/c-src/dostorture.c whitespace=cr-at-eol
-test/etags/cp-src/c.C whitespace=cr-at-eol
-test/etags/html-src/algrthms.html whitespace=cr-at-eol
+test/manual/etags/c-src/dostorture.c whitespace=cr-at-eol
+test/manual/etags/cp-src/c.C whitespace=cr-at-eol
+test/manual/etags/html-src/algrthms.html whitespace=cr-at-eol
-# The todo-mode file format includes trailing whitespace, so the test
-# data files cannot avoid it.
-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 todo-mode file format includes trailing whitespace.
+*.tod[aorty] -whitespace=blank-at-eol
# The upstream maintainer does not want to remove trailing whitespace.
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
# Git's builtin diff hunk header styles.
-*.ada diff=ada
-*.[ch] diff=cpp
+*.ad[abs] diff=ada
+*.[Cch] diff=cpp
*.cc diff=cpp
-*.cpp diff=cpp
+*.[ch]pp diff=cpp
*.hh diff=cpp
*.for diff=fortran
*.html diff=html
*.shtml diff=html
*.xml diff=html
*.java diff=java
-*.m diff=objc
+*.[HMm] diff=objc
+*.pas diff=pascal
*.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.
@@ -78,7 +75,7 @@ etc/e/eterm-color binary
*.mk diff=make
*[Mm]akefile diff=make
Makefile.in diff=make
-*.sh diff=shell
+*[-.]sh diff=shell
*.texi diff=texinfo
#
# Diff hunk header special-case file names.
@@ -91,6 +88,8 @@ admin/merge-pkg-config diff=shell
admin/quick-install-emacs diff=shell
admin/update-copyright 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/pre-commit diff=shell
build-aux/gitlog-to-emacslog diff=shell