Mercurial > hg > xemacs-beta

comparison src/window.c @ 5050:6f2158fa75ed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix quick-build, use asserts() in place of ABORT() -------------------- ChangeLog entries follow: -------------------- ChangeLog addition: 2010-02-20 Ben Wing <ben@xemacs.org> * configure.ac (XE_COMPLEX_ARG): Correct doc of --quick-build: It also doesn't check for Lisp shadows. src/ChangeLog addition: 2010-02-20 Ben Wing <ben@xemacs.org> * EmacsFrame.c: * EmacsFrame.c (EmacsFrameRecomputeCellSize): * alloca.c (i00afunc): * buffer.c: * buffer.c (MARKED_SLOT): * buffer.c (complex_vars_of_buffer): * cm.c: * cm.c (cmcheckmagic): * console.c: * console.c (MARKED_SLOT): * device-x.c: * device-x.c (x_get_visual_depth): * emacs.c (sort_args): * eval.c (throw_or_bomb_out): * event-stream.c: * event-stream.c (Fadd_timeout): * event-stream.c (Fadd_async_timeout): * event-stream.c (Frecent_keys): * events.c: * events.c (Fdeallocate_event): * events.c (event_pixel_translation): * extents.c: * extents.c (process_extents_for_insertion_mapper): * fns.c (Fbase64_encode_region): * fns.c (Fbase64_encode_string): * fns.c (Fbase64_decode_region): * fns.c (Fbase64_decode_string): * font-lock.c: * font-lock.c (find_context): * frame-x.c: * frame-x.c (x_wm_mark_shell_size_user_specified): * frame-x.c (x_wm_mark_shell_position_user_specified): * frame-x.c (x_wm_set_shell_iconic_p): * frame-x.c (x_wm_set_cell_size): * frame-x.c (x_wm_set_variable_size): * frame-x.c (x_wm_store_class_hints): * frame-x.c (x_wm_maybe_store_wm_command): * frame-x.c (x_initialize_frame_size): * frame.c (delete_frame_internal): * frame.c (change_frame_size_1): * free-hook.c (check_free): * free-hook.c (note_block_input): * free-hook.c (log_gcpro): * gccache-gtk.c (gc_cache_lookup): * gccache-x.c: * gccache-x.c (gc_cache_lookup): * glyphs-gtk.c: * glyphs-gtk.c (init_image_instance_from_gdk_pixmap): * glyphs-x.c: * glyphs-x.c (extract_xpm_color_names): * insdel.c: * insdel.c (move_gap): * keymap.c: * keymap.c (keymap_lookup_directly): * keymap.c (keymap_delete_inverse_internal): * keymap.c (accessible_keymaps_mapper_1): * keymap.c (where_is_recursive_mapper): * lisp.h: * lstream.c (make_lisp_buffer_stream_1): * macros.c: * macros.c (pop_kbd_macro_event): * mc-alloc.c (remove_page_from_used_list): * menubar-x.c: * menubar-x.c (set_frame_menubar): * ralloc.c: * ralloc.c (obtain): * ralloc.c (relinquish): * ralloc.c (relocate_blocs): * ralloc.c (resize_bloc): * ralloc.c (r_alloc_free): * ralloc.c (r_re_alloc): * ralloc.c (r_alloc_thaw): * ralloc.c (init_ralloc): * ralloc.c (Free_Addr_Block): * scrollbar-x.c: * scrollbar-x.c (x_update_scrollbar_instance_status): * sunplay.c (init_device): * unexnt.c: * unexnt.c (read_in_bss): * unexnt.c (map_in_heap): * window.c: * window.c (real_window): * window.c (window_display_lines): * window.c (window_display_buffer): * window.c (set_window_display_buffer): * window.c (unshow_buffer): * window.c (Fget_lru_window): if (...) ABORT(); ---> assert(); More specifically: if (x == y) ABORT (); --> assert (x != y); if (x != y) ABORT (); --> assert (x == y); if (x > y) ABORT (); --> assert (x <= y); etc. if (!x) ABORT (); --> assert (x); if (x) ABORT (); --> assert (!x); DeMorgan's Law's applied and manually simplified: if (x && !y) ABORT (); --> assert (!x || y); if (!x || y >= z) ABORT (); --> assert (x && y < z); Checked to make sure that assert() of an expression with side effects ensures that the side effects get executed even when asserts are disabled, and add a comment about this being a requirement of any "disabled assert" expression. * depend: * make-src-depend: * make-src-depend (PrintDeps): Fix broken code in make-src-depend so it does what it was always supposed to do, which was separate out config.h and lisp.h and all the files they include into separate variables in the depend part of Makefile so that quick-build can turn off the lisp.h/config.h/text.h/etc. dependencies of the source files, to speed up recompilation.
author Ben Wing <ben@xemacs.org>
date Sat, 20 Feb 2010 05:05:54 -0600
parents 0d4c9d0f6a8d
children 92dc90c0bb40
comparison
equal deleted inserted replaced
5030:422b4b4fb2a6 5050:6f2158fa75ed
1 /* Window creation, deletion and examination for XEmacs. 1 /* Window creation, deletion and examination for XEmacs.
2 Copyright (C) 1985-1987, 1992-1995 Free Software Foundation, Inc. 2 Copyright (C) 1985-1987, 1992-1995 Free Software Foundation, Inc.
3 Copyright (C) 1994, 1995 Board of Trustees, University of Illinois. 3 Copyright (C) 1994, 1995 Board of Trustees, University of Illinois.
4 Copyright (C) 1995, 1996, 2002 Ben Wing. 4 Copyright (C) 1995, 1996, 2002, 2010 Ben Wing.
5 Copyright (C) 1996 Chuck Thompson. 5 Copyright (C) 1996 Chuck Thompson.
6 6
7 This file is part of XEmacs. 7 This file is part of XEmacs.
8 8
9 XEmacs is free software; you can redistribute it and/or modify it 9 XEmacs is free software; you can redistribute it and/or modify it
700 real_window (struct window_mirror *mir, int no_abort) 700 real_window (struct window_mirror *mir, int no_abort)
701 { 701 {
702 Lisp_Object retval = 702 Lisp_Object retval =
703 real_window_internal (mir->frame->root_window, 703 real_window_internal (mir->frame->root_window,
704 XWINDOW_MIRROR (mir->frame->root_mirror), mir); 704 XWINDOW_MIRROR (mir->frame->root_mirror), mir);
705 if (NILP (retval) && !no_abort) 705 assert (!NILP (retval) || no_abort);
706 ABORT ();
707 706
708 return retval; 707 return retval;
709 } 708 }
710 709
711 /* Given a real window, return its mirror structure. Calls 710 /* Given a real window, return its mirror structure. Calls
763 struct window_mirror *t; 762 struct window_mirror *t;
764 763
765 if (XFRAME (w->frame)->mirror_dirty) 764 if (XFRAME (w->frame)->mirror_dirty)
766 update_frame_window_mirror (XFRAME (w->frame)); 765 update_frame_window_mirror (XFRAME (w->frame));
767 t = find_window_mirror (w); 766 t = find_window_mirror (w);
768 if (!t) 767 assert (t);
769 ABORT ();
770 768
771 if (which == CURRENT_DISP) 769 if (which == CURRENT_DISP)
772 return t->current_display_lines; 770 return t->current_display_lines;
773 else if (which == DESIRED_DISP) 771 else if (which == DESIRED_DISP)
774 return t->desired_display_lines; 772 return t->desired_display_lines;
787 struct window_mirror *t; 785 struct window_mirror *t;
788 786
789 if (XFRAME (w->frame)->mirror_dirty) 787 if (XFRAME (w->frame)->mirror_dirty)
790 update_frame_window_mirror (XFRAME (w->frame)); 788 update_frame_window_mirror (XFRAME (w->frame));
791 t = find_window_mirror (w); 789 t = find_window_mirror (w);
792 if (!t) 790 assert (t);
793 ABORT ();
794 791
795 return t->buffer; 792 return t->buffer;
796 } 793 }
797 794
798 void 795 void
801 struct window_mirror *t; 798 struct window_mirror *t;
802 799
803 if (XFRAME (w->frame)->mirror_dirty) 800 if (XFRAME (w->frame)->mirror_dirty)
804 update_frame_window_mirror (XFRAME (w->frame)); 801 update_frame_window_mirror (XFRAME (w->frame));
805 t = find_window_mirror (w); 802 t = find_window_mirror (w);
806 if (!t) 803 assert (t);
807 ABORT ();
808 804
809 t->buffer = b; 805 t->buffer = b;
810 } 806 }
811 807
812 808
2022 unshow_buffer (struct window *w) 2018 unshow_buffer (struct window *w)
2023 { 2019 {
2024 Lisp_Object buf = w->buffer; 2020 Lisp_Object buf = w->buffer;
2025 struct buffer *b = XBUFFER (buf); 2021 struct buffer *b = XBUFFER (buf);
2026 2022
2027 if (b != XMARKER (w->pointm[CURRENT_DISP])->buffer) 2023 assert (b == XMARKER (w->pointm[CURRENT_DISP])->buffer);
2028 ABORT ();
2029 2024
2030 /* FSF disables this check, so I'll do it too. I hope it won't 2025 /* FSF disables this check, so I'll do it too. I hope it won't
2031 break things. --ben */ 2026 break things. --ben */
2032 #if 0 2027 #if 0
2033 if (w == XWINDOW (Fselected_window (Qnil)) 2028 if (w == XWINDOW (Fselected_window (Qnil))
3136 3131
3137 /* If none of them, then all windows, dedicated or not. */ 3132 /* If none of them, then all windows, dedicated or not. */
3138 w = window_loop (GET_LRU_WINDOW, Qnil, 0, which_frames, 1, which_devices); 3133 w = window_loop (GET_LRU_WINDOW, Qnil, 0, which_frames, 1, which_devices);
3139 3134
3140 /* At this point we damn well better have found something. */ 3135 /* At this point we damn well better have found something. */
3141 if (NILP (w)) ABORT (); 3136 assert (!NILP (w));
3142 #endif 3137 #endif
3143 3138
3144 return w; 3139 return w;
3145 } 3140 }
3146 3141