.gitignore cleanup.

* .gitignore: Merge contents of subsidiary files and organize the
result so as to avoid duplication.  Remove no-longer needed entries.
* admin/charsets/.gitignore, admin/unidata/.gitignore:
* doc/lispintro/.gitignore, etc/.gitignore, leim/.gitignore:
* leim/ja-dic/.gitignore, lib-src/.gitignore, lisp/.gitignore:
* lisp/calc/.gitignore, lisp/calendar/.gitignore:
* lisp/cedet/.gitignore, lisp/emulation/.gitignore:
* lisp/erc/.gitignore, lisp/eshell/.gitignore, lisp/gnus/.gitignore:
* lisp/international/.gitignore, lisp/language/.gitignore:
* lisp/leim/.gitignore, lisp/leim/quail/.gitignore:
* lisp/mail/.gitignore, lisp/mh-e/.gitignore, lisp/net/.gitignore:
* lisp/nxml/.gitignore, lisp/obsolete/.gitignore:
* lisp/play/.gitignore, lisp/progmodes/.gitignore:
* lisp/term/.gitignore, lisp/textmodes/.gitignore:
* lisp/url/.gitignore, nt/.gitignore, src/.gitignore:
Remove; no longer needed.

1 files changed, 145 insertions, 85 deletions

diff --git a/.gitignore b/.gitignore
index 7f6aca7e0b0..bd48c284ed2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,48 +1,24 @@
-**/Makefile
-**/makefile
-
-configure
-aclocal.m4
-compile
-config.guess
-config.sub
-depcomp
-install-sh
-missing
+# Built by 'autogen.sh'.
+/aclocal.m4
+/configure
+build-aux/compile
+build-aux/config.guess
+build-aux/config.sub
+build-aux/depcomp
+build-aux/install-sh
+build-aux/missing
 lib/Makefile.in
 src/config.in
-autom4te.cache
-TAGS
-*~
-.#*
-/README.W32
 
-/bin/
-/site-lisp/
-/leim/ja-dic/
-etc/refcards/*.aux
-etc/refcards/*.log
-info/dir
-info/*.info
-test/biditest.txt
+# Built by 'configure'.
+Makefile
+makefile
+/*.cache
+/config.status
+src/config.h
+src/epaths.h
 
-config.log
-config.status
-config.cache
-lib-src/blessmail
-lib-src/ctags
-lib-src/ebrowse
-lib-src/emacsclient
-lib-src/etags
-lib-src/hexl
-lib-src/make-docfile
-lib-src/movemail
-lib-src/profile
-lib-src/test-distrib
-lib-src/update-game-score
-*.o
-*.exe
-*.res
+# C-level sources built by 'make'.
 lib/alloca.h
 lib/arg-nonnull.h
 lib/byteswap.h
@@ -55,59 +31,143 @@ lib/getopt.h
 lib/inttypes.h
 lib/libgnu.a
 lib/signal.h
+lib/stdalign.h
 lib/stdio.h
 lib/stdlib.h
-lib/stdalign.h
 lib/string.h
 lib/sys/
 lib/time.h
 lib/unistd.h
 lib/warn-on-use.h
+src/buildobj.h
+src/globals.h
+
+# Lisp-level sources built by 'make'.
+*cus-load.el
+*loaddefs.el
+leim/changed.misc
+leim/changed.tit
+lisp/cedet/semantic/bovine/c-by.el
+lisp/cedet/semantic/bovine/make-by.el
+lisp/cedet/semantic/bovine/scm-by.el
+lisp/cedet/semantic/wisent/javat-wy.el
+lisp/cedet/semantic/wisent/js-wy.el
+lisp/cedet/semantic/wisent/python-wy.el
+lisp/cedet/srecode/srt-wy.el
+lisp/eshell/esh-groups.el
+lisp/finder-inf.el
+lisp/leim/ja-dic/
+lisp/leim/leim-list.el
+lisp/leim/quail/4Corner.el
+lisp/leim/quail/ARRAY30.el
+lisp/leim/quail/CCDOSPY.el
+lisp/leim/quail/CTLau.el
+lisp/leim/quail/CTLau-b5.el
+lisp/leim/quail/ECDICT.el
+lisp/leim/quail/ETZY.el
+lisp/leim/quail/PY-b5.el
+lisp/leim/quail/PY.el
+lisp/leim/quail/Punct.el
+lisp/leim/quail/Punct-b5.el
+lisp/leim/quail/QJ.el
+lisp/leim/quail/QJ-b5.el
+lisp/leim/quail/SW.el
+lisp/leim/quail/TONEPY.el
+lisp/leim/quail/ZIRANMA.el
+lisp/leim/quail/ZOZY.el
+lisp/leim/quail/quick-b5.el
+lisp/leim/quail/quick-cns.el
+lisp/leim/quail/tsang-b5.el
+lisp/leim/quail/tsang-cns.el
+lisp/subdirs.el
+
+# Dependencies.
+.deps/
+deps/
+
+# Temporaries.
+*.tmp
+
+# Time stamps.
+stamp_BLD
+src/gl-stamp
+src/stamp-h.in
+src/stamp-h1
+
+# Object files and debugging.
+*.a
+*.elc
+*.o
+oo/
+oo-spd/
+src/*.map
+
+# Executables.
+lib-src/blessmail
+lib-src/ctags
+lib-src/ebrowse
+lib-src/emacsclient
+lib-src/etags
+lib-src/hexl
+lib-src/make-docfile
+lib-src/movemail
+lib-src/profile
+lib-src/test-distrib
+lib-src/update-game-score
 src/bootstrap-emacs
-src/deps/
 src/emacs
 src/emacs-[0-9]*
-src/gl-stamp
-src/globals.h
-src/stamp-h1
 src/temacs
-src/temacs.map
-src/temacs.tmp
-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
+
+# Character-set info.
+admin/charsets/*.el
+admin/charsets/*.map
+admin/unidata/unidata.txt
+lisp/international/charprop.el
+lisp/international/uni-*.el
+
+# Documentation.
+*.aux
+*.cm
+*.cms
+*.cp
+*.cps
+*.dvi
+*.fn
+*.fns
+*.html
+*.info
+*.ky
+*.kys
+*.log
+*.op
+*.ops
+*.pdf
+*.pg
+*.pgs
+*.pj
+*.pjs
+*.ps
+*.sc
+*.scs
+*.tg
+*.tgs
+*.toc
+*.tp
+*.tps
+*.vr
+*.vrs
+!doc/lispintro/cons-*.pdf
+!doc/lispintro/drawers.pdf
+!doc/lispintro/lambda-*.pdf
 doc/misc/cc-mode.ss
-lib/.deps/
-lisp/international/uni-brackets.el
-lwlib/deps/
-lwlib/liblw.a
-leim/changed.misc
-leim/changed.tit
+etc/DOC
+!etc/refcards/gnus-logo.pdf
+info/dir
+
+# Backup files and locks.
+*~
+.#*
+
+# Git output.
+[0-9]*.patch