X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/f773d35aa218d25ff8d933fce21643971ec713e5..7e09ef09a479731d01b1ca46e94ddadd73ac98e3:/.gitignore?ds=sidebyside

diff --git a/.gitignore b/.gitignore
index cd60123e1c..9810c1d22f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,28 @@
+# Files that Git should ignore in the Emacs source directory.
+
+# Copyright 2009-2015 Free Software Foundation, Inc.
+
+# This file is part of GNU Emacs.
+
+# GNU Emacs is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# GNU Emacs is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+
+# Currently we assume only Git 1.7.1 (April 2010) or later, so this
+# file does not rely on "**" in patterns.  The "**" feature was added
+# in Git 1.8.2 (March 2013).
+
+
 # Built by 'autogen.sh'.
 /aclocal.m4
 /configure
@@ -14,9 +39,16 @@ src/config.in
 Info.plist
 InfoPlist.strings
 Makefile
+!admin/charsets/Makefile
+!etc/refcards/Makefile
+!test/automated/data/flymake/Makefile
+!test/indent/Makefile
 makefile
 /*.cache
+/confdefs.h
 /config.status
+/configure.lineno
+/conftest*
 src/config.h
 src/epaths.h
 
@@ -33,10 +65,8 @@ lib/getopt.h
 lib/inttypes.h
 lib/libgnu.a
 lib/signal.h
-lib/stdalign.h
-lib/stdint.h
-lib/stdio.h
-lib/stdlib.h
+lib/std*.h
+!lib/std*.in.h
 lib/string.h
 lib/sys/
 lib/time.h
@@ -88,7 +118,8 @@ lisp/subdirs.el
 .deps/
 deps/
 
-# Temporaries.
+# Logs and temporaries.
+*.log
 *.tmp
 
 # Time stamps.
@@ -100,13 +131,36 @@ src/stamp-h1
 # Object files and debugging.
 *.a
 *.dSYM/
+*.core
 *.elc
 *.o
+*.res
+[0-9]*.core
+core
+core.*[0-9]
 oo/
 oo-spd/
 src/*.map
 
+# Tests.
+test/indent/*.new
+test/biditest.txt
+
+# ctags, etags.
+TAGS
+
+# GNU global.
+GPATH
+GSYMS
+GRTAGS
+GTAGS
+
+# GNU idutils.
+ID
+
 # Executables.
+*.exe
+a.out
 lib-src/blessmail
 lib-src/ctags
 lib-src/ebrowse
@@ -118,7 +172,11 @@ lib-src/movemail
 lib-src/profile
 lib-src/test-distrib
 lib-src/update-game-score
+nextstep/Cocoa/Emacs.base/Contents/Info.plist
+nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj
 nextstep/Emacs.app/
+nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop
+nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist
 src/bootstrap-emacs
 src/emacs
 src/emacs-[0-9]*
@@ -127,6 +185,7 @@ src/temacs
 # Character-set info.
 admin/charsets/*.el
 admin/charsets/*.map
+admin/charsets/jisx2131-filter
 admin/unidata/unidata.txt
 lisp/international/charprop.el
 lisp/international/uni-*.el
@@ -144,10 +203,13 @@ lisp/international/uni-*.el
 *.info
 *.ky
 *.kys
-*.log
 *.op
 *.ops
 *.pdf
+!doc/lispintro/cons-*.pdf
+!doc/lispintro/drawers.pdf
+!doc/lispintro/lambda-*.pdf
+!etc/refcards/gnus-logo.pdf
 *.pg
 *.pgs
 *.pj
@@ -162,20 +224,43 @@ lisp/international/uni-*.el
 *.tps
 *.vr
 *.vrs
-!doc/lispintro/cons-*.pdf
-!doc/lispintro/drawers.pdf
-!doc/lispintro/lambda-*.pdf
+doc/emacs/emacsver.texi
+doc/man/emacs.1
 doc/misc/cc-mode.ss
 etc/DOC
-!etc/refcards/gnus-logo.pdf
+etc/refcards/emacsver.tex
 info/dir
 
-# Backup files and locks.
+# Version control and locks.
+*.orig
+*.rej
 *~
 .#*
-
-# Git output.
+\#*\#
 [0-9]*.patch
 
+# Built by 'make install'.
+etc/emacs.tmpdesktop
+
 # Distribution directories.
 /emacs-[1-9]*/
+
+# Microsoft-related builds and installations.
+*.in-h
+_*
+!build-aux/snippet/_Noreturn.h
+/bin/
+/BIN/
+/data/
+etc/icons/
+lib/cxxdefs.h
+lib/SYS/
+/libexec/
+/lock/
+/README.W32
+/share/
+/site-lisp/
+nt/emacs.rc
+nt/emacsclient.rc
+src/gdb.ini
+/var/