comparison src/dispextern.h @ 108450:de8a1b891175

Merge from mainline.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Sun, 11 Apr 2010 10:53:01 +0000
parents c7670de45d8a
children c2eddf34eaf2
comparison
equal deleted inserted replaced
108449:0346e41d1e53 108450:de8a1b891175
2971 2971
2972 extern void expose_frame P_ ((struct frame *, int, int, int, int)); 2972 extern void expose_frame P_ ((struct frame *, int, int, int, int));
2973 extern int x_intersect_rectangles P_ ((XRectangle *, XRectangle *, 2973 extern int x_intersect_rectangles P_ ((XRectangle *, XRectangle *,
2974 XRectangle *)); 2974 XRectangle *));
2975 #endif 2975 #endif
2976
2977 /* Flags passed to try_window. */
2978 #define TRY_WINDOW_CHECK_MARGINS (1 << 0)
2979 #define TRY_WINDOW_IGNORE_FONTS_CHANGE (1 << 1)
2976 2980
2977 /* Defined in fringe.c */ 2981 /* Defined in fringe.c */
2978 2982
2979 int lookup_fringe_bitmap (Lisp_Object); 2983 int lookup_fringe_bitmap (Lisp_Object);
2980 void draw_fringe_bitmap P_ ((struct window *, struct glyph_row *, int)); 2984 void draw_fringe_bitmap P_ ((struct window *, struct glyph_row *, int));