Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

[gnu-emacs] / .gitignore

diff --git a/.gitignore b/.gitignore
index cad16845d71e9452c5d793c1e0e920b893ea81be..e544b10808b295d7f7b6e44cdf9a555b20b81ce2 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -42,6 +42,7 @@ InfoPlist.strings
 Makefile
 makefile
 !etc/refcards/Makefile
+!modules/mod-test/Makefile
 !test/lisp/progmodes/flymake-resources/Makefile
 !test/manual/indent/Makefile
 !test/manual/etags/Makefile
@@ -139,6 +140,8 @@ src/stamp-h1
 *.elc
 *.o
 *.res
+*.so
+*.dll
 [0-9]*.core
 core
 core.*[0-9]
@@ -149,10 +152,12 @@ src/*.map
 # Tests.
 test/indent/*.new
 test/biditest.txt
-test/etags/srclist
-test/etags/regexfile
-test/etags/ETAGS
-test/etags/CTAGS
+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 +212,7 @@ lisp/international/uni-*.el
 *.cms
 *.cp
 *.cps
+*.doc
 *.dvi
 *.fn
 *.fns