; Revert "* emacs-lisp/lisp-mnt.el (lm-header): save-excursion"

[gnu-emacs] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index 21af4e68770c8a595933eed068cc93ded8eee8ff..5ccf9a5eabbc1209e116b674170bc573e6b16ae4 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,6 +1,6 @@
 # Attributes of Emacs files in the Git repository.
 
-# Copyright 2015 Free Software Foundation, Inc.
+# Copyright 2015-2016 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -34,13 +34,19 @@ test/etags/html-src/algrthms.html whitespace=cr-at-eol
 doc/misc/texinfo.tex -whitespace=blank-at-eol
 
 # Some files should not be treated as text when diffing or merging.
+*.cur binary
 *.gpg binary
 *.gz binary
 *.icns binary
 *.ico binary
 *.pbm binary
 *.pdf binary
+*.pif binary
 *.png binary
 *.sig binary
 *.tiff binary
 etc/e/eterm-color binary
+
+# Hooks for non-default diff hunk headers; see autogen.sh.
+*.el diff=elisp
+*.texi diff=texinfo