Mercurial > emacs
changeset 69104:527507f1a62e
(Fwindow_list): Check `window' before doing XWINDOW.
The default `window' should not be "on a different frame".
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Wed, 22 Feb 2006 21:01:34 +0000 |
| parents | 98dc9c749829 |
| children | f04b50463c62 |
| files | src/ChangeLog src/window.c |
| diffstat | 2 files changed, 18 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Wed Feb 22 20:29:41 2006 +0000 +++ b/src/ChangeLog Wed Feb 22 21:01:34 2006 +0000 @@ -1,3 +1,8 @@ +2006-02-22 Stefan Monnier <monnier@iro.umontreal.ca> + + * window.c (Fwindow_list): Check `window' before doing XWINDOW. + The default `window' should not be "on a different frame". + 2006-02-22 Kim F. Storm <storm@cua.dk> * indent.c (Fvertical_motion): Only try to move back if we can. @@ -13,8 +18,8 @@ * macterm.c (GC_CLIP_REGION): Remove macro. (mac_begin_clip, mac_end_clip): Take arg GC instead of REGION. All uses changed. Don't do clipping if n_clip_rects is zero. - (mac_set_clip_rectangles): Use xassert instead of abort. Set - n_clip_rects. Don't make clip_region empty when number of + (mac_set_clip_rectangles): Use xassert instead of abort. + Set n_clip_rects. Don't make clip_region empty when number of clipping rectangles is zero. (mac_reset_clip_rectangles): Set n_clip_rects directly instead of calling mac_set_clip_rectangles. @@ -45,8 +50,8 @@ BG_WIDTH. All uses changed. Draw background if BG_WIDTH is not zero. (mac_draw_image_string, mac_draw_image_string_16): New arg BG_WIDTH. [USE_CG_TEXT_DRAWING] (mac_draw_image_string_cg): Rename from - mac_draw_string_cg. New arg BG_WIDTH. All uses changed. Draw - background if BG_WIDTH is not zero. Use float constants as + mac_draw_string_cg. New arg BG_WIDTH. All uses changed. + Draw background if BG_WIDTH is not zero. Use float constants as divisors instead of double. Use alloca instead of xmalloc/xfree. (x_draw_glyph_string_background, x_draw_glyph_string_foreground) [!MAC_OS8 || USE_ATSUI]: Background may be drawn using @@ -57,6 +62,11 @@ (mac_set_clip_rectangles): When resetting clip region, make it empty instead of disposing of it. +2006-02-20 Stefan Monnier <monnier@iro.umontreal.ca> + + * keymap.c (store_in_keymap): Change `def' arg to not be `register'. + Seems to trigger a bug in gcc-amd64 4.0.2 20051125 (Red Hat 4.0.2-8). + 2006-02-20 Kim F. Storm <storm@cua.dk> * Makefile.in: Add fringe.elc to WINDOW_SUPPORT. @@ -82,10 +92,10 @@ (left_curly_arrow_bits): Rename from continuation_bits. (right_curly_arrow_bits): Rename from continued_bits. (left_triangle_bits): Rename from ov_bits. - (right_triangle_bits): Added. + (right_triangle_bits): Add. (filled_rectangle_bits): Rename from filled_box_cursor_bits. (hollow_rectangle_bits): Rename from hollow_box_cursor_bits. - (filled_square_bits): Added. + (filled_square_bits): Add. (vertical_bar_bits): Rename from bar_cursor_bits. (horizontal_bar_bits): Rename from hbar_cursor_bits. (empty_line_bits): Rename from zv_bits.
--- a/src/window.c Wed Feb 22 20:29:41 2006 +0000 +++ b/src/window.c Wed Feb 22 21:01:34 2006 +0000 @@ -1861,7 +1861,8 @@ Lisp_Object frame, minibuf, window; { if (NILP (window)) - window = selected_window; + window = FRAMEP (frame) ? XFRAME (frame)->selected_window : selected_window; + CHECK_WINDOW (window); if (NILP (frame)) frame = selected_frame;