Merge branch 'emacs-24'

[gnu-emacs] / .gitignore

diff --git a/.gitignore b/.gitignore
index 16b92c427ae25d6497927582cdb1953d2fc2c688..4200d8a4963c6c8a8d344f3b4266aa4aa1481a5c 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+**/Makefile
+**/makefile
+
 configure
 aclocal.m4
 compile
@@ -9,7 +12,6 @@ missing
 lib/Makefile.in
 src/config.in
 autom4te.cache
-makefile
 TAGS
 *~
 .#*
@@ -24,7 +26,6 @@ info/dir
 info/*.info
 test/biditest.txt
 
-Makefile
 config.log
 config.status
 config.cache
@@ -72,9 +73,38 @@ src/stamp-h1
 src/temacs
 src/temacs.map
 src/temacs.tmp
-doc/emacs/emacsver.texi
-doc/man/emacs.1
-etc/refcards/emacsver.tex
+doc/*/*.aux
+doc/*/*.cm
+doc/*/*.cms
+doc/*/*.cp
+doc/*/*.cps
+doc/*/*.dvi
+doc/*/*.fn
+doc/*/*.fns
+doc/*/*.html
+doc/*/*.ky
+doc/*/*.kys
+doc/*/*.log
+doc/*/*.op
+doc/*/*.ops
+doc/*/*.pdf
+doc/*/*.pg
+doc/*/*.pgs
+doc/*/*.pj
+doc/*/*.pjs
+doc/*/*.ps
+doc/*/*.sc
+doc/*/*.scs
+doc/*/*.tg
+doc/*/*.tgs
+doc/*/*.tmp
+doc/*/*.toc
+doc/*/*.tp
+doc/*/*.tps
+doc/*/*.vr
+doc/*/*.vrs
+doc/*/texput.log
+doc/misc/cc-mode.ss
 lib/.deps/
 lisp/international/uni-brackets.el
 lwlib/deps/