mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-28 07:45:00 +00:00
Code Issues Releases Activity
2a88c6dc3c
emacs/.gitattributes

123 lines
3.4 KiB
Plaintext
Raw Normal View History

* .gitattributes: New file.
2015-01-01 16:58:26 +00:00
# Attributes of Emacs files in the Git repository.
; Add 2024 to copyright years
2024-01-02 01:47:10 +00:00
# Copyright 2015-2024 Free Software Foundation, Inc.
* .gitattributes: New file.
2015-01-01 16:58:26 +00:00
# This file is part of GNU Emacs.
# GNU Emacs is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# GNU Emacs is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
Prefer HTTPS to FTP and HTTP in documentation Most of this change is to boilerplate commentary such as license URLs. This change was prompted by ftp://ftp.gnu.org's going-away party, planned for November. Change these FTP URLs to https://ftp.gnu.org instead. Make similar changes for URLs to other organizations moving away from FTP. Also, change HTTP to HTTPS for URLs to gnu.org and fsf.org when this works, as this will further help defend against man-in-the-middle attacks (for this part I omitted the MS-DOS and MS-Windows sources and the test tarballs to keep the workload down). HTTPS is not fully working to lists.gnu.org so I left those URLs alone for now.
2017-09-13 22:52:52 +00:00
# along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
* .gitattributes: New file.
2015-01-01 16:58:26 +00:00
Update lists of non-UTF files * .gitattributes: Don't diff text files with encodings incompatible with UTF-8. Add some new binary file extensions, like '.webp'. etc/e/eterm-direct and java/emacs.keystore are also binary. * admin/notes/unicode: Update similarly.
2023-08-12 06:09:39 +00:00
# A few UTF-8-compatible text files use CRLF endings,
# even on non-Microsoft platforms.
* .gitattributes: New file.
2015-01-01 16:58:26 +00:00
# Do not warn about trailing whitespace with these files.
Update .gitattributes for DOS EOL files * .gitattributes: Use "whitespace=cr-at-eol" for files with DOS CRLF end-of-line format.
2015-06-01 15:01:49 +00:00
*.bat whitespace=cr-at-eol
admin/charsets/mapfiles/PTCP154 whitespace=cr-at-eol
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.
2017-05-30 15:22:27 +00:00
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
* .gitattributes: New file.
2015-01-01 16:58:26 +00:00
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.
2017-05-30 15:22:27 +00:00
# The todo-mode file format includes trailing whitespace.
*.tod[aorty] -whitespace=blank-at-eol
Add initial tests for todo-mode.el *test/lisp/calendar/todo-mode-tests.el: *test/lisp/calendar/todo-mode-resources/todo-test-1.toda: *test/lisp/calendar/todo-mode-resources/todo-test-1.todo: New files. * .gitattributes: Ignore trailing whitespace in todo-mode test data files, since it is part of the todo-mode file format.
2017-05-29 21:49:41 +00:00
Update lists of non-UTF files * .gitattributes: Don't diff text files with encodings incompatible with UTF-8. Add some new binary file extensions, like '.webp'. etc/e/eterm-direct and java/emacs.keystore are also binary. * admin/notes/unicode: Update similarly.
2023-08-12 06:09:39 +00:00
# The following text files use encodings incompatible with UTF-8.
# They should not be treated as text when diffing, as that could
# cause the output to mix encodings.
*.tit -diff
admin/charsets/mapfiles/cns2ucsdkw.txt -diff
leim/MISC-DIC/CTLau* -diff
leim/MISC-DIC/cangjie-table.* -diff
leim/MISC-DIC/pinyin.map -diff
leim/MISC-DIC/ziranma.cin -diff
leim/SKK-DIC/SKK-JISYO.L -diff
src/msdos.c -diff
test/lisp/gnus/mm-decode-resources/win1252-multipart.bin -diff
* .gitattributes: New file.
2015-01-01 16:58:26 +00:00
# Some files should not be treated as text when diffing or merging.
Update lists of non-UTF files * .gitattributes: Don't diff text files with encodings incompatible with UTF-8. Add some new binary file extensions, like '.webp'. etc/e/eterm-direct and java/emacs.keystore are also binary. * admin/notes/unicode: Update similarly.
2023-08-12 06:09:39 +00:00
*.bmp binary
* .gitattributes: *.cur and *.pif are binary files too.
2016-01-10 08:51:10 +00:00
*.cur binary
Update lists of non-UTF files * .gitattributes: Don't diff text files with encodings incompatible with UTF-8. Add some new binary file extensions, like '.webp'. etc/e/eterm-direct and java/emacs.keystore are also binary. * admin/notes/unicode: Update similarly.
2023-08-12 06:09:39 +00:00
*.gif binary
* .gitattributes: New file.
2015-01-01 16:58:26 +00:00
*.gpg binary
*.gz binary
*.icns binary
*.ico binary
Update lists of non-UTF files * .gitattributes: Don't diff text files with encodings incompatible with UTF-8. Add some new binary file extensions, like '.webp'. etc/e/eterm-direct and java/emacs.keystore are also binary. * admin/notes/unicode: Update similarly.
2023-08-12 06:09:39 +00:00
*.jpg binary
*.kbx binary
*.key binary
* .gitattributes: New file.
2015-01-01 16:58:26 +00:00
*.pbm binary
*.pdf binary
* .gitattributes: *.cur and *.pif are binary files too.
2016-01-10 08:51:10 +00:00
*.pif binary
* .gitattributes: New file.
2015-01-01 16:58:26 +00:00
*.png binary
*.sig binary
*.tiff binary
Update lists of non-UTF files * .gitattributes: Don't diff text files with encodings incompatible with UTF-8. Add some new binary file extensions, like '.webp'. etc/e/eterm-direct and java/emacs.keystore are also binary. * admin/notes/unicode: Update similarly.
2023-08-12 06:09:39 +00:00
*.webp binary
*.zip binary
Update .gitattributes to match current sources 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.
2015-05-30 16:33:41 +00:00
etc/e/eterm-color binary
Update lists of non-UTF files * .gitattributes: Don't diff text files with encodings incompatible with UTF-8. Add some new binary file extensions, like '.webp'. etc/e/eterm-direct and java/emacs.keystore are also binary. * admin/notes/unicode: Update similarly.
2023-08-12 06:09:39 +00:00
etc/e/eterm-direct binary
java/emacs.keystore binary
Improve git diff hunk headers for .el, .texi 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.
2015-09-21 18:56:01 +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.
2016-03-13 19:20:01 +00:00
# Git's builtin diff hunk header styles.
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.
2017-05-30 15:22:27 +00:00
*.ad[abs] diff=ada
*.[Cch] diff=cpp
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.
2016-03-13 19:20:01 +00:00
*.cc diff=cpp
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.
2017-05-30 15:22:27 +00:00
*.[ch]pp diff=cpp
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.
2016-03-13 19:20:01 +00:00
*.hh diff=cpp
*.for diff=fortran
*.html diff=html
*.shtml diff=html
*.xml diff=html
*.java diff=java
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.
2017-05-30 15:22:27 +00:00
*.[HMm] diff=objc
*.pas diff=pascal
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.
2016-03-13 19:20:01 +00:00
*.perl diff=perl
*.pl diff=perl
*.php diff=php
*.py diff=python
*.rb diff=ruby
*.tex diff=tex
Improve git diff hunk headers for .el, .texi 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.
2015-09-21 18:56:01 +00:00
# Hooks for non-default diff hunk headers; see autogen.sh.
*.el diff=elisp
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.
2016-03-13 19:20:01 +00:00
*.ac diff=m4
*.m4 diff=m4
*.mk diff=make
*[Mm]akefile diff=make
Makefile.in diff=make
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.
2017-05-30 15:22:27 +00:00
*[-.]sh diff=shell
Improve git diff hunk headers for .el, .texi 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.
2015-09-21 18:56:01 +00:00
*.texi diff=texinfo
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.
2016-03-13 19:20:01 +00:00
#
# 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
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.
2017-05-30 15:22:27 +00:00
build-aux/config.guess diff=shell
build-aux/config.sub diff=shell
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.
2016-03-13 19:20:01 +00:00
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
; Fix issues running gitmerge * .gitattributes: Ignore whitespace issues in java/INSTALL. * build-aux/git-hooks/pre-commit (git_diff): Explicitly allow "ChangeLog.android". * java/README: Remove extra trailing newline.
2023-08-22 01:19:24 +00:00
# This file contains in-line diffs, which can include trailing
# whitespace.
java/INSTALL -whitespace
Reference in New Issue Copy Permalink