# HG changeset patch # User Miles Bader # Date 1004264554 0 # Node ID e071742a6bb809303337f76882de2f38c2ce0925 # Parent 3e67855bb4bf9252b93afd087876b9cf56283a69 *** empty log message *** diff -r 3e67855bb4bf -r e071742a6bb8 lisp/ChangeLog --- a/lisp/ChangeLog Sun Oct 28 10:19:33 2001 +0000 +++ b/lisp/ChangeLog Sun Oct 28 10:22:34 2001 +0000 @@ -1,3 +1,12 @@ +2001-10-28 Miles Bader + + * faces.el (face-attribute): Add INHERIT argument, consider face + inheritance if it's non-nil. + (face-attribute-merged-with): New function. + (face-attribute-specified-or): New macro. + (face-foreground, face-background, face-stipple): Add INHERIT + argument. Use `face-attribute-specified-or'. + 2001-10-28 Stefan Monnier * font-lock.el: Require `syntax'. diff -r 3e67855bb4bf -r e071742a6bb8 src/ChangeLog --- a/src/ChangeLog Sun Oct 28 10:19:33 2001 +0000 +++ b/src/ChangeLog Sun Oct 28 10:22:34 2001 +0000 @@ -1,3 +1,10 @@ +2001-10-28 Miles Bader + + * xfaces.c (merge_face_heights): Handle TO being relative as well. + Remove #ifdef'd-out code. + (Fface_attribute_relative_p, Fmerge_face_attribute): New functions. + (syms_of_xfaces): Initialize them. + 2001-10-27 Jason Rumney * w32fns.c (w32_wnd_proc) : Destroy the system caret. @@ -113,7 +120,6 @@ `background_valid', and `background_transparent' fields. (image_background, image_background_transparent): New declarations. (IMAGE_BACKGROUND, IMAGE_BACKGROUND_TRANSPARENT): New macros. - * xfns.c (image_background, image_background_transparent) (four_corners_best): New functions. (xpm_format, png_format, jpeg_format, tiff_format, gif_format) @@ -133,7 +139,6 @@ (enum gs_keyword_index): Add GS_BACKGROUND. (pbm_load, png_load, jpeg_load, tiff_load, gif_load): Pre-calculate image background color where necessary. - * xterm.c (x_setup_relief_colors): Use `IMAGE_BACKGROUND' and `IMAGE_BACKGROUND_TRANSPARENT' to calculate the correct background color to use for image glyph reliefs.