Mercurial > hg > xemacs-beta

comparison src/frame.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 16112448d484
children 92dc90c0bb40
comparison
equal deleted inserted replaced
5030:422b4b4fb2a6 5050:6f2158fa75ed
1804 there. If this were not true, all of the frames present 1804 there. If this were not true, all of the frames present
1805 would have to be minibuffer-less, which implies that at some 1805 would have to be minibuffer-less, which implies that at some
1806 point their minibuffer frames must have been deleted, but 1806 point their minibuffer frames must have been deleted, but
1807 that is prohibited at the top; you can't delete surrogate 1807 that is prohibited at the top; you can't delete surrogate
1808 minibuffer frames. */ 1808 minibuffer frames. */
1809 if (NILP (frame_with_minibuf)) 1809 assert (!NILP (frame_with_minibuf));
1810 ABORT ();
1811 1810
1812 con->default_minibuffer_frame = frame_with_minibuf; 1811 con->default_minibuffer_frame = frame_with_minibuf;
1813 } 1812 }
1814 else 1813 else
1815 /* No frames left on this console--say no minibuffer either. */ 1814 /* No frames left on this console--say no minibuffer either. */
3274 is being "changed" to its existing size, and do nothing if so? */ 3273 is being "changed" to its existing size, and do nothing if so? */
3275 /* No, because it would hose toolbar updates. The toolbar 3274 /* No, because it would hose toolbar updates. The toolbar
3276 update code relies on this function to cause window `top' and 3275 update code relies on this function to cause window `top' and
3277 `left' coordinates to be recomputed even though no frame size 3276 `left' coordinates to be recomputed even though no frame size
3278 change occurs. --kyle */ 3277 change occurs. --kyle */
3279 if (in_display || hold_frame_size_changes) 3278 assert (!in_display && !hold_frame_size_changes);
3280 ABORT ();
3281 3279
3282 frame = wrap_frame (f); 3280 frame = wrap_frame (f);
3283 3281
3284 default_face_height_and_width (frame, &real_font_height, 0); 3282 default_face_height_and_width (frame, &real_font_height, 0);
3285 default_face_height_and_width_1 (frame, &font_height, &font_width); 3283 default_face_height_and_width_1 (frame, &font_height, &font_width);