Mercurial > emacs
comparison src/dispextern.h @ 107818:c7670de45d8a
Don't abort try_window with fonts change when showing tooltip (Bug#2423).
* dispextern.h (TRY_WINDOW_CHECK_MARGINS)
(TRY_WINDOW_IGNORE_FONTS_CHANGE): New defines.
* xdisp.c (try_window): Change arg from CHECK_MARGINS to FLAGS.
Don't abort with fonts change if TRY_WINDOW_IGNORE_FONTS_CHANGE is
set in FLAGS. Callers with non-zero CHECK_MARGINS changed to use
TRY_WINDOW_CHECK_MARGINS.
* xfns.c (Fx_show_tip): Call try_window with TRY_WINDOW_IGNORE_FONTS_CHANGE.
author | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> |
---|---|
date | Sat, 10 Apr 2010 19:52:30 +0900 |
parents | 41747909cb4b |
children | c2eddf34eaf2 |
comparison
equal
deleted
inserted
replaced
107817:8973aee6b80a | 107818:c7670de45d8a |
---|---|
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)); |