Merge from emacs-24

[gnu-emacs] / .gitignore

diff --git a/.gitignore b/.gitignore
index ff0e5ed0101a555ef809bca6fcf1ee8f7fa0282d..228deaaf8e529e62a031555eb5d660d5318f267e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,11 @@
 # along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 
+# Currently we assume only Git 1.7.1 (April 2010) or later, so this
+# file does not rely on "**" in patterns.  The "**" feature was added
+# in Git 1.8.2 (March 2013).
+
+
 # Built by 'autogen.sh'.
 /aclocal.m4
 /configure
@@ -72,13 +77,10 @@ src/buildobj.h
 src/globals.h
 
 # Lisp-level sources built by 'make'.
+*cus-load.el
+*loaddefs.el
 leim/changed.misc
 leim/changed.tit
-lisp/**/*cus-load.el
-lisp/cus-load.el
-lisp/**/*loaddefs.el
-lisp/**/**/*loaddefs.el
-lisp/*loaddefs.el
 lisp/cedet/semantic/bovine/c-by.el
 lisp/cedet/semantic/bovine/make-by.el
 lisp/cedet/semantic/bovine/scm-by.el