summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGerd Moellmann <gerd@gnu.org>1999-10-07 00:36:36 +0000
committerGerd Moellmann <gerd@gnu.org>1999-10-07 00:36:36 +0000
commit577d9e2f1dfbcfffbc1c1295635be3fc9a5adf19 (patch)
tree7b9fa862938582d82aa28ee3c9da9407698520dc /src
parent48f68b550e4ab839423d6b5bf59d361ba1802916 (diff)
downloademacs-577d9e2f1dfbcfffbc1c1295635be3fc9a5adf19.tar.gz
*** empty log message ***
Diffstat (limited to 'src')
-rw-r--r--src/.gitignore10
-rw-r--r--src/ChangeLog12
2 files changed, 22 insertions, 0 deletions
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.