[BACK]Return to window-copy.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / tmux

Diff for /src/usr.bin/tmux/window-copy.c between version 1.276 and 1.277

version 1.276, 2020/04/16 05:22:08 version 1.277, 2020/04/17 08:03:22
Line 1728 
Line 1728 
         if (cs->args->argc == 3)          if (cs->args->argc == 3)
                 prefix = format_single(NULL, cs->args->argv[2], c, s, wl, wp);                  prefix = format_single(NULL, cs->args->argv[2], c, s, wl, wp);
   
         if (s != NULL && *cs->args->argv[1] != '\0') {          if (s != NULL && cs->args->argc > 1 && *cs->args->argv[1] != '\0')
                 command = format_single(NULL, cs->args->argv[1], c, s, wl, wp);                  command = format_single(NULL, cs->args->argv[1], c, s, wl, wp);
                 window_copy_copy_pipe(wme, s, prefix, command);          window_copy_copy_pipe(wme, s, prefix, command);
                 free(command);          free(command);
         }  
   
         free(prefix);          free(prefix);
         return (WINDOW_COPY_CMD_NOTHING);          return (WINDOW_COPY_CMD_NOTHING);
Line 2066 
Line 2065 
           window_copy_cmd_copy_end_of_line },            window_copy_cmd_copy_end_of_line },
         { "copy-line", 0, 1, 0,          { "copy-line", 0, 1, 0,
           window_copy_cmd_copy_line },            window_copy_cmd_copy_line },
         { "copy-pipe-no-clear", 1, 2, 0,          { "copy-pipe-no-clear", 0, 2, 0,
           window_copy_cmd_copy_pipe_no_clear },            window_copy_cmd_copy_pipe_no_clear },
         { "copy-pipe", 1, 2, 0,          { "copy-pipe", 0, 2, 0,
           window_copy_cmd_copy_pipe },            window_copy_cmd_copy_pipe },
         { "copy-pipe-and-cancel", 1, 2, 0,          { "copy-pipe-and-cancel", 0, 2, 0,
           window_copy_cmd_copy_pipe_and_cancel },            window_copy_cmd_copy_pipe_and_cancel },
         { "copy-selection-no-clear", 0, 1, 0,          { "copy-selection-no-clear", 0, 1, 0,
           window_copy_cmd_copy_selection_no_clear },            window_copy_cmd_copy_selection_no_clear },
Line 3471 
Line 3470 
         if (buf == NULL)          if (buf == NULL)
                 return;                  return;
   
         job = job_run(cmd, s, NULL, NULL, NULL, NULL, NULL, JOB_NOWAIT, -1, -1);          if (cmd == NULL || *cmd == '\0')
         bufferevent_write(job_get_event(job), buf, len);                  cmd = options_get_string(global_options, "copy-command");
           if (cmd != NULL && *cmd != '\0') {
                   job = job_run(cmd, s, NULL, NULL, NULL, NULL, NULL, JOB_NOWAIT,
                       -1, -1);
                   bufferevent_write(job_get_event(job), buf, len);
           }
         window_copy_copy_buffer(wme, prefix, buf, len);          window_copy_copy_buffer(wme, prefix, buf, len);
 }  }
   
Legend:
Removed from v.1.276  
changed lines
  Added in v.1.277