diff options
| author | Paul Eggert | 2018-12-09 00:18:36 -0800 |
|---|---|---|
| committer | Paul Eggert | 2018-12-09 00:23:55 -0800 |
| commit | d79bb75683ceb4eee2f753eb38fa8db99aff4568 (patch) | |
| tree | b0b20c25387c2eb11b2c79e87898bec2c39b14ea /src/term.c | |
| parent | c2fdd50c3cb0b03d2414370c58c1aa2a6ec3311d (diff) | |
| download | emacs-d79bb75683ceb4eee2f753eb38fa8db99aff4568.tar.gz emacs-d79bb75683ceb4eee2f753eb38fa8db99aff4568.zip | |
Add make_vector and make_nil_vector
This makes the callers a bit easier to read, and doubtless
improves efficiency very slightly. It also simplifies
possible future changes to allow bignum indexes to buffers.
* src/alloc.c (allocate_vectorlike):
Prefer ptrdiff_t to size_t when either will do.
(make_vector): New function.
(Fmake_vector): Use it.
* src/buffer.c (syms_of_buffer):
* src/bytecode.c (syms_of_bytecode):
* src/category.c (Fmake_category_table, init_category_once):
* src/ccl.c (syms_of_ccl):
* src/character.c (syms_of_character):
* src/charset.c (Fdefine_charset_internal)
(Ffind_charset_region, Ffind_charset_string):
* src/chartab.c (copy_char_table):
* src/coding.c (Fdefine_coding_system_internal, syms_of_coding):
* src/composite.c (get_composition_id, Fcomposition_get_gstring):
* src/composite.h (LGLYPH_NEW):
* src/fns.c (concat, Flocale_info, make_hash_table):
* src/font.c (font_otf_ValueRecord, font_otf_anchor)
(build_style_table, syms_of_font):
* src/fontset.c (RFONT_DEF_NEW, fontset_find_font)
(dump_fontset, syms_of_fontset):
* src/image.c (xpm_make_color_table_v):
* src/keyboard.c (modify_event_symbol, menu_bar_items)
(parse_menu_item, parse_tool_bar_item, init_tool_bar_items)
(syms_of_keyboard):
* src/keymap.c (Fdefine_key, describe_map, describe_vector):
* src/lread.c (read_vector):
* src/macfont.m (macfont_shape):
* src/menu.c (init_menu_items):
* src/nsfns.m (ns_make_monitor_attribute_list):
* src/process.c (conv_sockaddr_to_lisp, network_interface_info):
* src/profiler.c (make_log):
* src/window.c (Fcurrent_window_configuration):
* src/xdisp.c (with_echo_area_buffer_unwind_data)
(format_mode_line_unwind_data):
* src/xfaces.c (Finternal_make_lisp_face)
(Fface_attributes_as_vector):
* src/xfns.c (x_make_monitor_attribute_list)
(Fx_display_monitor_attributes_list):
* src/xfont.c (syms_of_xfont):
* src/xselect.c (x_handle_dnd_message):
* src/xwidget.c (save_script_callback):
Prefer make_nil_vector (N) to Fmake_vector (make_fixnum (N), Qnil).
* src/callint.c (Fcall_interactively):
* src/charset.c (load_charset_map):
* src/chartab.c (Fmake_char_table, uniprop_encode_value_numeric):
* src/composite.c (get_composition_id)
* src/dispnew.c (Fframe_or_buffer_changed_p)
(syms_of_display):
* src/fns.c (make_hash_table, maybe_resize_hash_table):
* src/font.c (font_style_to_value):
* src/fontset.c (FONTSET_ADD, fontset_add):
* src/json.c (json_to_lisp):
* src/keymap.c (syms_of_keymap):
* src/lread.c (init_obarray):
* src/profiler.c (make_log, Fprofiler_cpu_log):
* src/term.c (term_get_fkeys_1):
Prefer make_vector (N, V) to Fmake_vector (make_fixnum (N), V).
* src/font.c (build_style_table):
* src/macfont.m (macfont_shape):
* src/process.c (conv_sockaddr_to_lisp, network_interface_info):
Prefer make_uninit_vector if the vector will be initialized soon.
* src/lisp.h (make_nil_vector): New function.
Diffstat (limited to 'src/term.c')
| -rw-r--r-- | src/term.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/term.c b/src/term.c index 852dc23bd60..34659083ac3 100644 --- a/src/term.c +++ b/src/term.c | |||
| @@ -1359,8 +1359,7 @@ term_get_fkeys_1 (void) | |||
| 1359 | char *sequence = tgetstr (keys[i].cap, address); | 1359 | char *sequence = tgetstr (keys[i].cap, address); |
| 1360 | if (sequence) | 1360 | if (sequence) |
| 1361 | Fdefine_key (KVAR (kboard, Vinput_decode_map), build_string (sequence), | 1361 | Fdefine_key (KVAR (kboard, Vinput_decode_map), build_string (sequence), |
| 1362 | Fmake_vector (make_fixnum (1), | 1362 | make_vector (1, intern (keys[i].name))); |
| 1363 | intern (keys[i].name))); | ||
| 1364 | } | 1363 | } |
| 1365 | 1364 | ||
| 1366 | /* The uses of the "k0" capability are inconsistent; sometimes it | 1365 | /* The uses of the "k0" capability are inconsistent; sometimes it |
| @@ -1379,13 +1378,13 @@ term_get_fkeys_1 (void) | |||
| 1379 | /* Define f0 first, so that f10 takes precedence in case the | 1378 | /* Define f0 first, so that f10 takes precedence in case the |
| 1380 | key sequences happens to be the same. */ | 1379 | key sequences happens to be the same. */ |
| 1381 | Fdefine_key (KVAR (kboard, Vinput_decode_map), build_string (k0), | 1380 | Fdefine_key (KVAR (kboard, Vinput_decode_map), build_string (k0), |
| 1382 | Fmake_vector (make_fixnum (1), intern ("f0"))); | 1381 | make_vector (1, intern ("f0"))); |
| 1383 | Fdefine_key (KVAR (kboard, Vinput_decode_map), build_string (k_semi), | 1382 | Fdefine_key (KVAR (kboard, Vinput_decode_map), build_string (k_semi), |
| 1384 | Fmake_vector (make_fixnum (1), intern ("f10"))); | 1383 | make_vector (1, intern ("f10"))); |
| 1385 | } | 1384 | } |
| 1386 | else if (k0) | 1385 | else if (k0) |
| 1387 | Fdefine_key (KVAR (kboard, Vinput_decode_map), build_string (k0), | 1386 | Fdefine_key (KVAR (kboard, Vinput_decode_map), build_string (k0), |
| 1388 | Fmake_vector (make_fixnum (1), intern (k0_name))); | 1387 | make_vector (1, intern (k0_name))); |
| 1389 | } | 1388 | } |
| 1390 | 1389 | ||
| 1391 | /* Set up cookies for numbered function keys above f10. */ | 1390 | /* Set up cookies for numbered function keys above f10. */ |
| @@ -1408,8 +1407,7 @@ term_get_fkeys_1 (void) | |||
| 1408 | { | 1407 | { |
| 1409 | sprintf (fkey, "f%d", i); | 1408 | sprintf (fkey, "f%d", i); |
| 1410 | Fdefine_key (KVAR (kboard, Vinput_decode_map), build_string (sequence), | 1409 | Fdefine_key (KVAR (kboard, Vinput_decode_map), build_string (sequence), |
| 1411 | Fmake_vector (make_fixnum (1), | 1410 | make_vector (1, intern (fkey))); |
| 1412 | intern (fkey))); | ||
| 1413 | } | 1411 | } |
| 1414 | } | 1412 | } |
| 1415 | } | 1413 | } |
| @@ -1425,8 +1423,7 @@ term_get_fkeys_1 (void) | |||
| 1425 | char *sequence = tgetstr (cap2, address); \ | 1423 | char *sequence = tgetstr (cap2, address); \ |
| 1426 | if (sequence) \ | 1424 | if (sequence) \ |
| 1427 | Fdefine_key (KVAR (kboard, Vinput_decode_map), build_string (sequence), \ | 1425 | Fdefine_key (KVAR (kboard, Vinput_decode_map), build_string (sequence), \ |
| 1428 | Fmake_vector (make_fixnum (1), \ | 1426 | make_vector (1, intern (sym))); \ |
| 1429 | intern (sym))); \ | ||
| 1430 | } | 1427 | } |
| 1431 | 1428 | ||
| 1432 | /* if there's no key_next keycap, map key_npage to `next' keysym */ | 1429 | /* if there's no key_next keycap, map key_npage to `next' keysym */ |