(EmacsFrameSetCharSize): Take widget's border width into account. (set_frame_size): Use FRAME_SCROLL_BAR_COLS to determine vertical_scroll_bar_extra. (EmacsFrameSetCharSize): Ditto. (EmacsFrameDestroy): Remove call to free_frame_faces; it's also called from x_destroy_window. Since this function is called from X, freeing stuff allocated with xmalloc is dangerous here, anyway. (widget_store_internal_border): Return void. (create_frame_gcs): Don't allocate relief GCs. (setup_frame_gcs): Don't change relief GCs. (setup_frame_gcs): Initialize relief GC's to line width 1; remove references to relief_gc_line_width. (create_frame_gcs): Create GC's for relief drawing. (setup_frame_gcs): Initialize them. (EmacsFrameDestroy): Free them. (set_frame_size): Double trunc_area_extra. (EmacsFrameSetCharSize): Ditto. (set_frame_size): Set it. (EmacsFrameSetCharSize): Ditto.