5 files changed, 41 insertions, 0 deletions

diff --git a/etc/.gitignore b/etc/.gitignore
index 29241f472db..6f1c180a692 100644
--- a/etc/.gitignore
+++ b/etc/.gitignore
@@ -1,3 +1,4 @@
 fns-*
 *.ps
 *.log
+DOC DOC-*
diff --git a/lib-src/.gitignore b/lib-src/.gitignore
new file mode 100644
index 00000000000..b5eea5caab4
--- /dev/null
+++ b/lib-src/.gitignore
@@ -0,0 +1,17 @@
+Makefile.c
+fns-*
+test-distrib
+make-docfile
+profile
+digest-doc
+sorted-doc
+movemail
+cvtmail
+fakemail
+yow
+emacsserver
+hexl
+etags
+ctags
+emacsclient
+b2m
diff --git a/lisp/.gitignore b/lisp/.gitignore
new file mode 100644
index 00000000000..d7ede1746ce
--- /dev/null
+++ b/lisp/.gitignore
@@ -0,0 +1 @@
+cus-load.el
diff --git a/src/.gitignore b/src/.gitignore
new file mode 100644
index 00000000000..6568596b674
--- /dev/null
+++ b/src/.gitignore
@@ -0,0 +1,10 @@
+Makefile.c
+config.h
+epaths.h
+config.stamp
+stamp-oldxmenu
+prefix-args
+temacs
+emacs
+emacs-*
+*.core
diff --git a/src/ChangeLog b/src/ChangeLog
index 18d3efcc73a..3bad3d9c61a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,17 @@
 1999-10-07  Gerd Moellmann  <gerd@gnu.org>
 
+        * xfaces.c (Qbitmap_spec_p): Replaces Qpixmap_spec_p.
+        (Fbitmap_spec_p): Replaces Fpixmap_spec_p.
+        (load_pixmap): Use Fbitmap_spec_p and Qbitmap_spec_p instead of
+        Fpixmap_spec_p and Qpixmap_spec_p.
+        (load_face_colors, check_lface_attrs,
+        merge_face_vector_with_property,
+        Finternal_set_lisp_face_attribute): Use Fbitmap_spec_p.
+        (syms_of_xfaces): Initialize Qbitmap_spec_p, defsubr
+        Fbitmap_spec_p.
+
+1999-10-07  Gerd Moellmann  <gerd@gnu.org>
+
         * xdisp.c (display_menu_bar): Use MENU_FACE_ID instead of
         MODE_LINE_FACE_ID.