Merge from emacs--rel--22

[gnu-emacs] / .gitignore

diff --git a/.gitignore b/.gitignore
index 6f0a84ff21ccb6d3499d1b633558d38b55a89db5..f000a4e4516275f2eda57eb9a2e2af66f94aef02 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -26,17 +26,20 @@ _$*
 *.ln
 core
 # CVS default ignores end
-configure
+*.xdelta
+.DS_Store
+Makefile
+autom4te.cache
 bin
 boot.log
 boot.log.diff
 boot.log.old
-update.log
+config.cache
 config.log
 config.status
-config.cache
-Makefile
+data
 emacs*.tar.gz
 leim*.tar.gz
-*.xdelta
-autom4te.cache
+lock
+site-lisp
+update.log