emacs/.gitattributes, branch comment-cache Emacs is the extensible, customizable, self-documenting real-time display editor. Merge from origin/emacs-25 2017-01-01T09:10:47+00:00 Paul Eggert 2017-01-01T09:10:47+00:00 bcf244ef9be0fe61f4b9a48d3412b2c8a9f1edb9 2e2a806 Fix copyright years by hand 5badc81 Update copyright year to 2017 
2e2a806 Fix copyright years by hand
5badc81 Update copyright year to 2017
Update copyright year to 2017 2017-01-01T03:42:26+00:00 Paul Eggert 2017-01-01T03:14:01+00:00 5badc81c1cdfbb261ad3e6d1b753defb15712f26 Run admin/update-copyright. 
Run admin/update-copyright.
Encode the shr tests files with trailing white space 2016-04-24T13:18:29+00:00 Lars Magne Ingebrigtsen 2016-04-24T13:18:22+00:00 331f4a638150c1ab8ae5bea86b901f32263b9192 






Allow the shr test files to have trailing blank space.
2016-03-20T13:07:47+00:00

Lars Magne Ingebrigtsen

2016-03-20T13:07:47+00:00

565df7265dd73b4812fcb02cd1663fce4dc40be7

* .gitattributes: Allow the shr test files to have trailing
blank space.





* .gitattributes: Allow the shr test files to have trailing
blank space.







Improve diff hunk headers when maintaining Emacs
2016-03-13T19:58:30+00:00

Paul Eggert

2016-03-13T19:20:01+00:00

181e92c4e060a7ce4740b561375f9ec9f473f144

* .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.





* .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.







* .gitattributes: *.cur and *.pif are binary files too.
2016-01-10T08:51:10+00:00

Paul Eggert

2016-01-10T08:51:10+00:00

684eb58db992dec56a05719732edc547fa77c1be












Update copyright year to 2016
2016-01-01T09:34:24+00:00

Paul Eggert

2016-01-01T09:16:19+00:00

0e963201d03d9229bb8ac4323291d2b0119526ed

Run admin/update-copyright.





Run admin/update-copyright.







Improve git diff hunk headers for .el, .texi
2015-09-21T18:56:50+00:00

Paul Eggert

2015-09-21T18:56:01+00:00

e3a6246eff4a793171511f32e9c6877faa2f6f3e

Problem reported by Alan Mackenzie in:
http://lists.gnu.org/archive/html/emacs-devel/2015-09/msg00826.html
* .gitattributes (*.el, *.texi): New patterns.
* autogen.sh: Configure diff.elisp.xfuncname and
diff.texinfo.xfuncname if using Git.





Problem reported by Alan Mackenzie in:
http://lists.gnu.org/archive/html/emacs-devel/2015-09/msg00826.html
* .gitattributes (*.el, *.texi): New patterns.
* autogen.sh: Configure diff.elisp.xfuncname and
diff.texinfo.xfuncname if using Git.







Update .gitattributes for DOS EOL files
2015-06-01T15:01:49+00:00

Eli Zaretskii

2015-06-01T15:01:49+00:00

d0848f8ddee353c99409caf1dd25e003c8b5af98

* .gitattributes: Use "whitespace=cr-at-eol" for files with DOS
CRLF end-of-line format.





* .gitattributes: Use "whitespace=cr-at-eol" for files with DOS
CRLF end-of-line format.







Update .gitattributes to match current sources
2015-05-30T16:34:37+00:00

Paul Eggert

2015-05-30T16:33:41+00:00

e553c503f4d71e60db1f382c8d9d2348e7b20887

http://lists.gnu.org/archive/html/emacs-devel/2015-05/msg00879.html
* .gitattributes: Accommodate tests that insist on DOS format.
Remove test/automated/data/decompress/foo-gzipped.
Add etc/e/eterm-color.





http://lists.gnu.org/archive/html/emacs-devel/2015-05/msg00879.html
* .gitattributes: Accommodate tests that insist on DOS format.
Remove test/automated/data/decompress/foo-gzipped.
Add etc/e/eterm-color.