* lisp/startup.el (normal-top-level): Use delay-warning. (Bug#20792)

[gnu-emacs] / .gitignore

diff --git a/.gitignore b/.gitignore
index 618249c8defde443cea9631a2ed91c2f9c1a1acd..092fd03fb64b4d477ec626fb1374d13d1a66ac0c 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -40,7 +40,6 @@ Info.plist
 InfoPlist.strings
 Makefile
 makefile
-!admin/charsets/Makefile
 !etc/refcards/Makefile
 !test/automated/data/flymake/Makefile
 !test/indent/Makefile
@@ -126,6 +125,7 @@ deps/
 *.tmp
 
 # Time stamps.
+*.stamp
 stamp_BLD
 src/gl-stamp
 src/stamp-h.in
@@ -155,6 +155,7 @@ test/etags/CTAGS
 
 # ctags, etags.
 TAGS
+!admin/notes/tags
 
 # GNU global.
 GPATH
@@ -190,11 +191,12 @@ src/emacs-[0-9]*
 src/temacs
 
 # Character-set info.
-admin/charsets/*.el
-admin/charsets/*.map
 admin/charsets/jisx2131-filter
 admin/unidata/unidata.txt
+etc/charsets/*.map
 lisp/international/charprop.el
+lisp/international/cp51932.el
+lisp/international/eucjp-ms.el
 lisp/international/uni-*.el
 
 # Documentation.
@@ -206,8 +208,6 @@ lisp/international/uni-*.el
 *.dvi
 *.fn
 *.fns
-*.html
-!test/etags/html-src/*.html
 *.info
 *.ky
 *.kys
@@ -222,8 +222,6 @@ lisp/international/uni-*.el
 *.pgs
 *.pj
 *.pjs
-*.ps
-!test/etags/ps-src/*.ps
 *.sc
 *.scs
 *.t2d/
@@ -234,6 +232,10 @@ lisp/international/uni-*.el
 *.tps
 *.vr
 *.vrs
+doc/*/*.html
+doc/*/*/*.html
+doc/*/*.ps
+doc/*/*/*.ps
 doc/emacs/emacsver.texi
 doc/man/emacs.1
 doc/misc/cc-mode.ss
@@ -250,6 +252,8 @@ gnustmp*
 \#*\#
 ChangeLog
 [0-9]*.patch
+[0-9]*.txt
+/vc-dwim-log-*
 
 # Built by 'make install'.
 etc/emacs.tmpdesktop