# Files that Git should ignore in the Emacs source directory.
-# Copyright 2009-2014 Free Software Foundation, Inc.
+# Copyright 2009-2015 Free Software Foundation, Inc.
# This file is part of GNU Emacs.
# along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
+# Currently we assume only Git 1.7.1 (April 2010) or later, so this
+# file does not rely on "**" in patterns. The "**" feature was added
+# in Git 1.8.2 (March 2013).
+
+
# Built by 'autogen.sh'.
/aclocal.m4
/configure
Info.plist
InfoPlist.strings
Makefile
-!admin/charsets/Makefile
+makefile
!etc/refcards/Makefile
-!test/automated/flymake/warnpred/Makefile
+!test/automated/data/flymake/Makefile
!test/indent/Makefile
-makefile
+!test/etags/Makefile
+!test/etags/make-src/Makefile
/*.cache
/confdefs.h
/config.status
/configure.lineno
+/conftest*
src/config.h
src/epaths.h
lib/inttypes.h
lib/libgnu.a
lib/signal.h
-lib/stdalign.h
-lib/stdint.h
-lib/stdio.h
-lib/stdlib.h
+lib/std*.h
+!lib/std*.in.h
lib/string.h
lib/sys/
lib/time.h
lib/warn-on-use.h
src/buildobj.h
src/globals.h
+src/lisp.mk
# Lisp-level sources built by 'make'.
+*cus-load.el
+*loaddefs.el
leim/changed.misc
leim/changed.tit
-lisp/**/*cus-load.el
-lisp/**/*loaddefs.el
lisp/cedet/semantic/bovine/c-by.el
lisp/cedet/semantic/bovine/make-by.el
lisp/cedet/semantic/bovine/scm-by.el
*.tmp
# Time stamps.
+*.stamp
stamp_BLD
src/gl-stamp
src/stamp-h.in
# Tests.
test/indent/*.new
+test/biditest.txt
+test/etags/srclist
+test/etags/regexfile
+test/etags/ETAGS
+test/etags/CTAGS
# ctags, etags.
TAGS
+!admin/notes/tags
# GNU global.
GPATH
src/temacs
# Character-set info.
-admin/charsets/*.el
-admin/charsets/*.map
admin/charsets/jisx2131-filter
admin/unidata/unidata.txt
+etc/charsets/*.map
lisp/international/charprop.el
+lisp/international/charscript.el
+lisp/international/cp51932.el
+lisp/international/eucjp-ms.el
lisp/international/uni-*.el
# Documentation.
*.dvi
*.fn
*.fns
-*.html
*.info
*.ky
*.kys
*.pgs
*.pj
*.pjs
-*.ps
*.sc
*.scs
+*.t2d/
*.tg
*.tgs
*.toc
*.tps
*.vr
*.vrs
+doc/*/*.html
+doc/*/*/*.html
+doc/*/*.ps
+doc/*/*/*.ps
+doc/emacs/emacsver.texi
+doc/man/emacs.1
doc/misc/cc-mode.ss
etc/DOC
-info/dir
+etc/refcards/emacsver.tex
+gnustmp*
+/info/
# Version control and locks.
*.orig
*.rej
*~
.#*
+\#*\#
+ChangeLog
[0-9]*.patch
+[0-9]*.txt
+/vc-dwim-log-*
# Built by 'make install'.
etc/emacs.tmpdesktop
/README.W32
/share/
/site-lisp/
+nt/emacs.rc
+nt/emacsclient.rc
src/gdb.ini
/var/