Merge from origin/emacs-24

[gnu-emacs] / .gitignore

diff --git a/.gitignore b/.gitignore
index cbe13091b059fb461fe3345eaad3d96f3351ff71..97adfb956107b447324ff21443a2bf2b91056381 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -41,7 +41,7 @@ InfoPlist.strings
 Makefile
 !admin/charsets/Makefile
 !etc/refcards/Makefile
-!test/automated/flymake/warnpred/Makefile
+!test/automated/data/flymake/Makefile
 !test/indent/Makefile
 makefile
 /*.cache
@@ -144,6 +144,7 @@ src/*.map
 
 # Tests.
 test/indent/*.new
+test/biditest.txt
 
 # ctags, etags.
 TAGS
@@ -223,8 +224,11 @@ lisp/international/uni-*.el
 *.tps
 *.vr
 *.vrs
+doc/emacs/emacsver.texi
+doc/man/emacs.1
 doc/misc/cc-mode.ss
 etc/DOC
+etc/refcards/emacsver.tex
 info/dir
 
 # Version control and locks.
@@ -256,5 +260,7 @@ lib/SYS/
 /README.W32
 /share/
 /site-lisp/
+nt/emacs.rc
+nt/emacsclient.rc
 src/gdb.ini
 /var/