aboutsummaryrefslogtreecommitdiffstats
path: root/src/callproc.c
diff options
context:
space:
mode:
authorPaul Eggert2013-07-15 23:39:49 -0700
committerPaul Eggert2013-07-15 23:39:49 -0700
commit6c6f1994bf684f510d600bd18023fa01b4b06500 (patch)
tree04b7125d1327d8419024f28d14bfb384afc52cdd /src/callproc.c
parent8abee653a22b0b879a9376c1dce3e3ca2e2f31d6 (diff)
downloademacs-6c6f1994bf684f510d600bd18023fa01b4b06500.tar.gz
emacs-6c6f1994bf684f510d600bd18023fa01b4b06500.zip
Prefer list1 (X) to Fcons (X, Qnil) when building lists.
This makes the code easier to read and the executable a bit smaller. Do not replace all calls to Fcons that happen to create lists, just calls that are intended to create lists. For example, when creating an alist that maps FOO to nil, use list1 (Fcons (FOO, Qnil)) rather than list1 (list1 (FOO)) or Fcons (Fcons (FOO, Qnil), Qnil). Similarly for list2 through list5. * buffer.c (Fget_buffer_create, Fmake_indirect_buffer): * bytecode.c (exec_byte_code): * callint.c (quotify_arg, Fcall_interactively): * callproc.c (Fcall_process, create_temp_file): * charset.c (load_charset_map_from_file) (Fdefine_charset_internal, init_charset): * coding.c (get_translation_table, detect_coding_system) (Fcheck_coding_systems_region) (Fset_terminal_coding_system_internal) (Fdefine_coding_system_internal, Fdefine_coding_system_alias): * composite.c (update_compositions, Ffind_composition_internal): * dired.c (directory_files_internal, file_name_completion) (Fsystem_users): * dispnew.c (Fopen_termscript, bitch_at_user, init_display): * doc.c (Fsnarf_documentation): * editfns.c (Fmessage_box): * emacs.c (main): * eval.c (do_debug_on_call, signal_error, maybe_call_debugger) (Feval, eval_sub, Ffuncall, apply_lambda): * fileio.c (make_temp_name, Fcopy_file, Faccess_file) (Fset_file_selinux_context, Fset_file_acl, Fset_file_modes) (Fset_file_times, Finsert_file_contents) (Fchoose_write_coding_system, Fwrite_region): * fns.c (Flax_plist_put, Fyes_or_no_p, syms_of_fns): * font.c (font_registry_charsets, font_parse_fcname) (font_prepare_cache, font_update_drivers, Flist_fonts): * fontset.c (Fset_fontset_font, Ffontset_info, syms_of_fontset): * frame.c (make_frame, Fmake_terminal_frame) (x_set_frame_parameters, x_report_frame_params) (x_default_parameter, Fx_parse_geometry): * ftfont.c (syms_of_ftfont): * image.c (gif_load): * keyboard.c (command_loop_1): * keymap.c (Fmake_keymap, Fmake_sparse_keymap, access_keymap_1) (Fcopy_keymap, append_key, Fcurrent_active_maps) (Fminor_mode_key_binding, accessible_keymaps_1) (Faccessible_keymaps, Fwhere_is_internal): * lread.c (read_emacs_mule_char): * menu.c (find_and_return_menu_selection): * minibuf.c (get_minibuffer): * nsfns.m (Fns_perform_service): * nsfont.m (ns_script_to_charset): * nsmenu.m (ns_popup_dialog): * nsselect.m (ns_get_local_selection, ns_string_from_pasteboard) (Fx_own_selection_internal): * nsterm.m (append2): * print.c (Fredirect_debugging_output) (print_prune_string_charset): * process.c (Fdelete_process, Fprocess_contact) (Fformat_network_address, set_socket_option) (read_and_dispose_of_process_output, write_queue_push) (send_process, exec_sentinel): * sound.c (Fplay_sound_internal): * textprop.c (validate_plist, add_properties) (Fput_text_property, Fadd_face_text_property) (copy_text_properties, text_property_list, syms_of_textprop): * unexaix.c (report_error): * unexcoff.c (report_error): * unexsol.c (unexec): * xdisp.c (redisplay_tool_bar, store_mode_line_string) (Fformat_mode_line, syms_of_xdisp): * xfaces.c (set_font_frame_param) (Finternal_lisp_face_attribute_values) (Finternal_merge_in_global_face, syms_of_xfaces): * xfns.c (x_default_scroll_bar_color_parameter) (x_default_font_parameter, x_create_tip_frame): * xfont.c (xfont_supported_scripts): * xmenu.c (Fx_popup_dialog, xmenu_show, xdialog_show) (menu_help_callback, xmenu_show): * xml.c (make_dom): * xterm.c (set_wm_state): Prefer list1 (FOO) to Fcons (FOO, Qnil) when creating a list, and similarly for list2 through list5.
Diffstat (limited to 'src/callproc.c')
-rw-r--r--src/callproc.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/callproc.c b/src/callproc.c
index 6d770f881ff..86d82466801 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -392,7 +392,7 @@ usage: (call-process PROGRAM &optional INFILE DESTINATION DISPLAY &rest ARGS) *
392 392
393 if (NILP (Ffile_accessible_directory_p (current_dir))) 393 if (NILP (Ffile_accessible_directory_p (current_dir)))
394 report_file_error ("Setting current directory", 394 report_file_error ("Setting current directory",
395 Fcons (BVAR (current_buffer, directory), Qnil)); 395 list1 (BVAR (current_buffer, directory)));
396 396
397 if (STRING_MULTIBYTE (infile)) 397 if (STRING_MULTIBYTE (infile))
398 infile = ENCODE_FILE (infile); 398 infile = ENCODE_FILE (infile);
@@ -410,7 +410,7 @@ usage: (call-process PROGRAM &optional INFILE DESTINATION DISPLAY &rest ARGS) *
410 filefd = emacs_open (SSDATA (infile), O_RDONLY, 0); 410 filefd = emacs_open (SSDATA (infile), O_RDONLY, 0);
411 if (filefd < 0) 411 if (filefd < 0)
412 report_file_error ("Opening process input file", 412 report_file_error ("Opening process input file",
413 Fcons (DECODE_FILE (infile), Qnil)); 413 list1 (DECODE_FILE (infile)));
414 414
415 if (STRINGP (output_file)) 415 if (STRINGP (output_file))
416 { 416 {
@@ -422,7 +422,7 @@ usage: (call-process PROGRAM &optional INFILE DESTINATION DISPLAY &rest ARGS) *
422 int open_errno = errno; 422 int open_errno = errno;
423 output_file = DECODE_FILE (output_file); 423 output_file = DECODE_FILE (output_file);
424 report_file_errno ("Opening process output file", 424 report_file_errno ("Opening process output file",
425 Fcons (output_file, Qnil), open_errno); 425 list1 (output_file), open_errno);
426 } 426 }
427 if (STRINGP (error_file) || NILP (error_file)) 427 if (STRINGP (error_file) || NILP (error_file))
428 output_to_buffer = 0; 428 output_to_buffer = 0;
@@ -441,7 +441,7 @@ usage: (call-process PROGRAM &optional INFILE DESTINATION DISPLAY &rest ARGS) *
441 int openp_errno = errno; 441 int openp_errno = errno;
442 emacs_close (filefd); 442 emacs_close (filefd);
443 report_file_errno ("Searching for program", 443 report_file_errno ("Searching for program",
444 Fcons (args[0], Qnil), openp_errno); 444 list1 (args[0]), openp_errno);
445 } 445 }
446 } 446 }
447 447
@@ -506,7 +506,7 @@ usage: (call-process PROGRAM &optional INFILE DESTINATION DISPLAY &rest ARGS) *
506 int open_errno = errno; 506 int open_errno = errno;
507 emacs_close (filefd); 507 emacs_close (filefd);
508 report_file_errno ("Opening process output file", 508 report_file_errno ("Opening process output file",
509 Fcons (build_string (tempfile), Qnil), open_errno); 509 list1 (build_string (tempfile)), open_errno);
510 } 510 }
511 } 511 }
512 else 512 else
@@ -564,7 +564,7 @@ usage: (call-process PROGRAM &optional INFILE DESTINATION DISPLAY &rest ARGS) *
564 else if (STRINGP (error_file)) 564 else if (STRINGP (error_file))
565 error_file = DECODE_FILE (error_file); 565 error_file = DECODE_FILE (error_file);
566 report_file_errno ("Cannot redirect stderr", 566 report_file_errno ("Cannot redirect stderr",
567 Fcons (error_file, Qnil), open_errno); 567 list1 (error_file), open_errno);
568 } 568 }
569 569
570#ifdef MSDOS /* MW, July 1993 */ 570#ifdef MSDOS /* MW, July 1993 */
@@ -596,8 +596,7 @@ usage: (call-process PROGRAM &optional INFILE DESTINATION DISPLAY &rest ARGS) *
596 unlink (tempfile); 596 unlink (tempfile);
597 emacs_close (filefd); 597 emacs_close (filefd);
598 report_file_errno ("Cannot re-open temporary file", 598 report_file_errno ("Cannot re-open temporary file",
599 Fcons (build_string (tempfile), Qnil), 599 list1 (build_string (tempfile)), open_errno);
600 open_errno);
601 } 600 }
602 } 601 }
603 else 602 else
@@ -1028,7 +1027,7 @@ create_temp_file (ptrdiff_t nargs, Lisp_Object *args)
1028#endif 1027#endif
1029 if (fd < 0) 1028 if (fd < 0)
1030 report_file_error ("Failed to open temporary file using pattern", 1029 report_file_error ("Failed to open temporary file using pattern",
1031 Fcons (pattern, Qnil)); 1030 list1 (pattern));
1032 emacs_close (fd); 1031 emacs_close (fd);
1033 } 1032 }
1034 1033