*** empty log message ***

This commit is contained in:
Miles Bader 2001-10-28 10:22:34 +00:00
parent c7f814cb6d
commit 5bbf4378a0
2 changed files with 16 additions and 2 deletions

View file

@ -1,3 +1,12 @@
2001-10-28 Miles Bader <miles@gnu.org>
* 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 <monnier@cs.yale.edu>
* font-lock.el: Require `syntax'.

View file

@ -1,3 +1,10 @@
2001-10-28 Miles Bader <miles@gnu.org>
* 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 <jasonr@gnu.org>
* w32fns.c (w32_wnd_proc) <WM_KILLFOCUS>: 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.