Disable multicolor fonts on OS X since they are not supported on free systems

[gnu-emacs] / .gitignore

diff --git a/.gitignore b/.gitignore
index 092fd03fb64b4d477ec626fb1374d13d1a66ac0c..7c8b74336d0e6aca267d212ee17f10e26d14b478 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 # Files that Git should ignore in the Emacs source directory.
 
-# Copyright 2009-2015 Free Software Foundation, Inc.
+# Copyright 2009-2016 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -26,6 +26,7 @@
 # Built by 'autogen.sh'.
 /aclocal.m4
 /configure
+build-aux/ar-lib
 build-aux/compile
 build-aux/config.guess
 build-aux/config.sub
@@ -41,6 +42,7 @@ InfoPlist.strings
 Makefile
 makefile
 !etc/refcards/Makefile
+!modules/mod-test/Makefile
 !test/automated/data/flymake/Makefile
 !test/indent/Makefile
 !test/etags/Makefile
@@ -138,6 +140,8 @@ src/stamp-h1
 *.elc
 *.o
 *.res
+*.so
+*.dll
 [0-9]*.core
 core
 core.*[0-9]
@@ -195,6 +199,7 @@ admin/charsets/jisx2131-filter
 admin/unidata/unidata.txt
 etc/charsets/*.map
 lisp/international/charprop.el
+lisp/international/charscript.el
 lisp/international/cp51932.el
 lisp/international/eucjp-ms.el
 lisp/international/uni-*.el
@@ -205,6 +210,7 @@ lisp/international/uni-*.el
 *.cms
 *.cp
 *.cps
+*.doc
 *.dvi
 *.fn
 *.fns
@@ -253,6 +259,7 @@ gnustmp*
 ChangeLog
 [0-9]*.patch
 [0-9]*.txt
+.dir-locals?.el
 /vc-dwim-log-*
 
 # Built by 'make install'.