* lisp/emacs-lisp/cl|eieio: Minor tweaks

[gnu-emacs] / .gitignore

diff --git a/.gitignore b/.gitignore
index 188dd9f55d83002c2e6592b78cdb922e58776f95..9810c1d22fc84c8e862f72ab43f2e93b082d3d99 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 # Files that Git should ignore in the Emacs source directory.
 
-# Copyright 2009-2014 Free Software Foundation, Inc.
+# Copyright 2009-2015 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -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