From: Lars Magne Ingebrigtsen <larsi@gnus.org>
Date: Mon, 1 Dec 2014 16:11:50 +0000 (+0100)
Subject: * .gitignore: Ignore loaddefs directly under lisp, and in sub-sub-directories
X-Git-Tag: emacs-25.0.90~2635^2~251
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/dce46a7484d9898cc161a8333ec71db3480b110b

* .gitignore: Ignore loaddefs directly under lisp, and in sub-sub-directories
---

diff --git a/.gitignore b/.gitignore
index 8e8a032ef5..71ded399f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -75,7 +75,10 @@ src/globals.h
 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
diff --git a/ChangeLog b/ChangeLog
index a3c342c95f..cd7698c0ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-01  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* .gitignore: Ignore loaddefs directly under lisp, and in
+	sub-sub-directories.
+
 2014-11-29  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Add more of the old .bzrignore to .gitignore.