aboutsummaryrefslogtreecommitdiffstats
path: root/src/xterm.c
diff options
context:
space:
mode:
authorPaul Eggert2012-09-30 23:36:54 -0700
committerPaul Eggert2012-09-30 23:36:54 -0700
commitb0ab8123df78b7149d1f55b2ef0d3095c3f10628 (patch)
tree14d324cb46348dbf9a4568c7050d2776259c5358 /src/xterm.c
parent05584c31090df82f831f2998939fd423f036e86d (diff)
downloademacs-b0ab8123df78b7149d1f55b2ef0d3095c3f10628.tar.gz
emacs-b0ab8123df78b7149d1f55b2ef0d3095c3f10628.zip
Prefer plain 'static' to 'static inline'.
With static functions, modern compilers inline pretty well by themselves; advice from programmers often hurts as much as it helps. On my host (x86-64, Fedora 17, GCC 4.7.2, default 'configure'), this change shrinks the text size of the Emacs executable by 1.1% without affecting CPU significantly in my benchmark. * alloc.c (mem_find, live_string_p, live_cons_p, live_symbol_p) (live_float_p, live_misc_p, live_vector_p, live_buffer_p) (mark_maybe_object, mark_maybe_pointer, bounded_number): * buffer.c (bset_abbrev_mode, bset_abbrev_table) (bset_auto_fill_function, bset_auto_save_file_format) (bset_auto_save_file_name, bset_backed_up, bset_begv_marker) (bset_bidi_display_reordering, bset_buffer_file_coding_system) (bset_cache_long_line_scans, bset_case_fold_search) (bset_ctl_arrow, bset_cursor_in_non_selected_windows) (bset_cursor_type, bset_display_table, bset_extra_line_spacing) (bset_file_format, bset_file_truename, bset_fringe_cursor_alist) (bset_fringe_indicator_alist, bset_fringes_outside_margins) (bset_header_line_format, bset_indicate_buffer_boundaries) (bset_indicate_empty_lines, bset_invisibility_spec) (bset_left_fringe_width, bset_major_mode, bset_mark) (bset_minor_modes, bset_mode_line_format, bset_mode_name) (bset_name, bset_overwrite_mode, bset_pt_marker) (bset_right_fringe_width, bset_save_length) (bset_scroll_bar_width, bset_scroll_down_aggressively) (bset_scroll_up_aggressively, bset_selective_display) (bset_selective_display_ellipses, bset_vertical_scroll_bar_type) (bset_word_wrap, bset_zv_marker, set_buffer_overlays_before) (set_buffer_overlays_after): * category.c (bset_category_table): * charset.c (read_hex): * coding.c (produce_composition, produce_charset) (handle_composition_annotation, handle_charset_annotation) (char_encodable_p): * dispnew.c (swap_glyph_pointers, copy_row_except_pointers) (assign_row, set_frame_matrix_frame, make_current) (add_row_entry): * eval.c (set_specpdl_symbol, set_specpdl_old_value): * fns.c (maybe_resize_hash_table): * frame.c (fset_buffer_predicate, fset_minibuffer_window): * gmalloc.c (register_heapinfo): * image.c (lookup_image_type): * intervals.c (set_interval_object, set_interval_left) (set_interval_right, copy_interval_parent, rotate_right) (rotate_left, balance_possible_root_interval): * keyboard.c (kset_echo_string, kset_kbd_queue) (kset_keyboard_translate_table, kset_last_prefix_arg) (kset_last_repeatable_command, kset_local_function_key_map) (kset_overriding_terminal_local_map, kset_real_last_command) (kset_system_key_syms, clear_event, set_prop): * lread.c (digit_to_number): * marker.c (attach_marker, live_buffer, set_marker_internal): * nsterm.m (ns_compute_glyph_string_overhangs): * process.c (pset_buffer, pset_command) (pset_decode_coding_system, pset_decoding_buf) (pset_encode_coding_system, pset_encoding_buf, pset_filter) (pset_log, pset_mark, pset_name, pset_plist, pset_sentinel) (pset_status, pset_tty_name, pset_type, pset_write_queue): * syntax.c (bset_syntax_table, dec_bytepos): * terminal.c (tset_param_alist): * textprop.c (interval_has_some_properties) (interval_has_some_properties_list): * window.c (wset_combination_limit, wset_dedicated) (wset_display_table, wset_hchild, wset_left_fringe_width) (wset_left_margin_cols, wset_new_normal, wset_new_total) (wset_normal_cols, wset_normal_lines, wset_parent, wset_pointm) (wset_right_fringe_width, wset_right_margin_cols) (wset_scroll_bar_width, wset_start, wset_temslot, wset_vchild) (wset_vertical_scroll_bar_type, wset_window_parameters): * xdisp.c (wset_base_line_number, wset_base_line_pos) (wset_column_number_displayed, wset_region_showing) (window_box_edges, run_window_scroll_functions) (append_glyph_string_lists, prepend_glyph_string_lists) (append_glyph_string, set_glyph_string_background_width) (append_glyph, append_composite_glyph) (take_vertical_position_into_account): * xfaces.c (x_create_gc, x_free_gc, merge_face_vectors) (face_attr_equal_p, lface_equal_p, hash_string_case_insensitive) (lface_hash, lface_same_font_attributes_p, lookup_face): * xml.c (libxml2_loaded_p): * xterm.c (x_set_mode_line_face_gc, x_set_glyph_string_gc) (x_set_glyph_string_clipping, x_clear_glyph_string_rect): Now 'static', not 'static inline'. Fixes: debbugs:12541
Diffstat (limited to 'src/xterm.c')
-rw-r--r--src/xterm.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/xterm.c b/src/xterm.c
index 6cd1d583870..a4c3e125d8d 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -1027,7 +1027,7 @@ x_set_mouse_face_gc (struct glyph_string *s)
1027 Faces to use in the mode line have already been computed when the 1027 Faces to use in the mode line have already been computed when the
1028 matrix was built, so there isn't much to do, here. */ 1028 matrix was built, so there isn't much to do, here. */
1029 1029
1030static inline void 1030static void
1031x_set_mode_line_face_gc (struct glyph_string *s) 1031x_set_mode_line_face_gc (struct glyph_string *s)
1032{ 1032{
1033 s->gc = s->face->gc; 1033 s->gc = s->face->gc;
@@ -1038,7 +1038,7 @@ x_set_mode_line_face_gc (struct glyph_string *s)
1038 S->stippled_p to a non-zero value if the face of S has a stipple 1038 S->stippled_p to a non-zero value if the face of S has a stipple
1039 pattern. */ 1039 pattern. */
1040 1040
1041static inline void 1041static void
1042x_set_glyph_string_gc (struct glyph_string *s) 1042x_set_glyph_string_gc (struct glyph_string *s)
1043{ 1043{
1044 PREPARE_FACE_FOR_DISPLAY (s->f, s->face); 1044 PREPARE_FACE_FOR_DISPLAY (s->f, s->face);
@@ -1083,7 +1083,7 @@ x_set_glyph_string_gc (struct glyph_string *s)
1083/* Set clipping for output of glyph string S. S may be part of a mode 1083/* Set clipping for output of glyph string S. S may be part of a mode
1084 line or menu if we don't have X toolkit support. */ 1084 line or menu if we don't have X toolkit support. */
1085 1085
1086static inline void 1086static void
1087x_set_glyph_string_clipping (struct glyph_string *s) 1087x_set_glyph_string_clipping (struct glyph_string *s)
1088{ 1088{
1089 XRectangle *r = s->clip; 1089 XRectangle *r = s->clip;
@@ -1156,7 +1156,7 @@ x_compute_glyph_string_overhangs (struct glyph_string *s)
1156 1156
1157/* Fill rectangle X, Y, W, H with background color of glyph string S. */ 1157/* Fill rectangle X, Y, W, H with background color of glyph string S. */
1158 1158
1159static inline void 1159static void
1160x_clear_glyph_string_rect (struct glyph_string *s, int x, int y, int w, int h) 1160x_clear_glyph_string_rect (struct glyph_string *s, int x, int y, int w, int h)
1161{ 1161{
1162 XGCValues xgcv; 1162 XGCValues xgcv;