*** empty log message ***

diff --git a/etc/.gitignore b/etc/.gitignore
index 29241f472db6700fa6f3995e925cec7a4c20ca6b..6f1c180a6924dc550a2388268f075a7456528e85 100644 (file)
--- 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 (file)
index 0000000..b5eea5c
--- /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 (file)
index 0000000..d7ede17
--- /dev/null
+++ b/lisp/.gitignore
@@ -0,0 +1 @@
+cus-load.el

diff --git a/src/.gitignore b/src/.gitignore
new file mode 100644 (file)
index 0000000..6568596
--- /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 18d3efcc73a2b02a011361da58d81a937787fc70..3bad3d9c61ab143cfb1d53846e78dadf119840b0 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,15 @@
+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