Merge from origin/emacs-25

[gnu-emacs] / .gitignore

diff --git a/.gitignore b/.gitignore
index fda50e9df77a011454610a43233eee816325892d..94c4ba8e4bba77bd2f43177e3a0f3774610f5e38 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.
 
@@ -42,10 +42,11 @@ InfoPlist.strings
 Makefile
 makefile
 !etc/refcards/Makefile
-!test/automated/data/flymake/Makefile
-!test/indent/Makefile
-!test/etags/Makefile
-!test/etags/make-src/Makefile
+!modules/mod-test/Makefile
+!test/lisp/progmodes/flymake-resources/Makefile
+!test/manual/indent/Makefile
+!test/manual/etags/Makefile
+!test/manual/etags/make-src/Makefile
 /*.cache
 /confdefs.h
 /config.status
@@ -115,6 +116,7 @@ lisp/leim/quail/quick-b5.el
 lisp/leim/quail/quick-cns.el
 lisp/leim/quail/tsang-b5.el
 lisp/leim/quail/tsang-cns.el
+lisp/mh-e/mh-autoloads.el
 lisp/subdirs.el
 
 # Dependencies.
@@ -139,6 +141,8 @@ src/stamp-h1
 *.elc
 *.o
 *.res
+*.so
+*.dll
 [0-9]*.core
 core
 core.*[0-9]
@@ -148,11 +152,13 @@ src/*.map
 
 # Tests.
 test/indent/*.new
-test/biditest.txt
-test/etags/srclist
-test/etags/regexfile
-test/etags/ETAGS
-test/etags/CTAGS
+test/manual/biditest.txt
+test/manual/etags/srclist
+test/manual/etags/regexfile
+test/manual/etags/ETAGS
+test/manual/etags/CTAGS
+# Generated by test/make-test-deps.emacs-lisp
+test/make-test-deps.mk
 
 # ctags, etags.
 TAGS
@@ -207,6 +213,7 @@ lisp/international/uni-*.el
 *.cms
 *.cp
 *.cps
+*.doc
 *.dvi
 *.fn
 *.fns