diff options
| author | Paul Eggert | 2019-09-02 12:37:52 -0700 |
|---|---|---|
| committer | Paul Eggert | 2019-09-02 12:38:49 -0700 |
| commit | fda015e7b82a1ec3d1cb075799a67772744ce6c1 (patch) | |
| tree | fd24150923a0afb809cfcf063c454b3e1aacdf7a /.gitattributes | |
| parent | 7c37b17b3d6a9be06fa25b19f5eccbc72c52f71c (diff) | |
| download | emacs-fda015e7b82a1ec3d1cb075799a67772744ce6c1.tar.gz emacs-fda015e7b82a1ec3d1cb075799a67772744ce6c1.zip | |
Update from Gnulib
This incorporates:
2019-08-25 intprops.h, verify.h: port better to clang
2019-08-21 New strip-trailing-space option for srclist-update
* .gitattributes: Remove doc/misc/texinfo.tex special case,
which is no longer needed now that Gnulib trims blank-at-eol.
* build-aux/install-sh, doc/misc/texinfo.tex, lib/intprops.h:
* lib/regex_internal.c, lib/verify.h: Copy from Gnulib.
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/.gitattributes b/.gitattributes index 65a943f6954..e1fd4b12a8a 100644 --- a/.gitattributes +++ b/.gitattributes | |||
| @@ -31,9 +31,6 @@ test/manual/etags/html-src/algrthms.html whitespace=cr-at-eol | |||
| 31 | # The todo-mode file format includes trailing whitespace. | 31 | # The todo-mode file format includes trailing whitespace. |
| 32 | *.tod[aorty] -whitespace=blank-at-eol | 32 | *.tod[aorty] -whitespace=blank-at-eol |
| 33 | 33 | ||
| 34 | # The upstream maintainer does not want to remove trailing whitespace. | ||
| 35 | doc/misc/texinfo.tex -whitespace=blank-at-eol | ||
| 36 | |||
| 37 | # Some files should not be treated as text when diffing or merging. | 34 | # Some files should not be treated as text when diffing or merging. |
| 38 | *.cur binary | 35 | *.cur binary |
| 39 | *.gpg binary | 36 | *.gpg binary |