Merge from origin/emacs-24

[gnu-emacs] / .gitignore

diff --git a/.gitignore b/.gitignore
index 228deaaf8e529e62a031555eb5d660d5318f267e..97adfb956107b447324ff21443a2bf2b91056381 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -41,13 +41,14 @@ InfoPlist.strings
 Makefile
 !admin/charsets/Makefile
 !etc/refcards/Makefile
-!test/automated/flymake/warnpred/Makefile
+!test/automated/data/flymake/Makefile
 !test/indent/Makefile
 makefile
 /*.cache
 /confdefs.h
 /config.status
 /configure.lineno
+/conftest*
 src/config.h
 src/epaths.h
 
@@ -64,10 +65,8 @@ lib/getopt.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
@@ -237,6 +236,7 @@ info/dir
 *.rej
 *~
 .#*
+\#*\#
 [0-9]*.patch
 
 # Built by 'make install'.