Merge branch 'emacs-25' of /home/acm/emacs/emacs.git/emacs-25 into emacs-25

[gnu-emacs] / .gitignore

diff --git a/.gitignore b/.gitignore
index df9dc8b110ca187d418c1684071cfaa7c63c6a3e..7c8b74336d0e6aca267d212ee17f10e26d14b478 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 # Files that Git should ignore in the Emacs source directory.
 
-# Copyright 2009-2015 Free Software Foundation, Inc.
+# Copyright 2009-2016 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -26,6 +26,7 @@
 # Built by 'autogen.sh'.
 /aclocal.m4
 /configure
+build-aux/ar-lib
 build-aux/compile
 build-aux/config.guess
 build-aux/config.sub
@@ -41,6 +42,7 @@ InfoPlist.strings
 Makefile
 makefile
 !etc/refcards/Makefile
+!modules/mod-test/Makefile
 !test/automated/data/flymake/Makefile
 !test/indent/Makefile
 !test/etags/Makefile
@@ -125,6 +127,7 @@ deps/
 *.tmp
 
 # Time stamps.
+*.stamp
 stamp_BLD
 src/gl-stamp
 src/stamp-h.in
@@ -137,6 +140,8 @@ src/stamp-h1
 *.elc
 *.o
 *.res
+*.so
+*.dll
 [0-9]*.core
 core
 core.*[0-9]
@@ -154,6 +159,7 @@ test/etags/CTAGS
 
 # ctags, etags.
 TAGS
+!admin/notes/tags
 
 # GNU global.
 GPATH
@@ -189,11 +195,13 @@ src/emacs-[0-9]*
 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.
@@ -202,11 +210,10 @@ lisp/international/uni-*.el
 *.cms
 *.cp
 *.cps
+*.doc
 *.dvi
 *.fn
 *.fns
-*.html
-!test/etags/html-src/*.html
 *.info
 *.ky
 *.kys
@@ -221,8 +228,6 @@ lisp/international/uni-*.el
 *.pgs
 *.pj
 *.pjs
-*.ps
-!test/etags/ps-src/*.ps
 *.sc
 *.scs
 *.t2d/
@@ -233,6 +238,10 @@ lisp/international/uni-*.el
 *.tps
 *.vr
 *.vrs
+doc/*/*.html
+doc/*/*/*.html
+doc/*/*.ps
+doc/*/*/*.ps
 doc/emacs/emacsver.texi
 doc/man/emacs.1
 doc/misc/cc-mode.ss
@@ -249,6 +258,9 @@ gnustmp*
 \#*\#
 ChangeLog
 [0-9]*.patch
+[0-9]*.txt
+.dir-locals?.el
+/vc-dwim-log-*
 
 # Built by 'make install'.
 etc/emacs.tmpdesktop