aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-26 04:04:07 -04:00
Code Activity

patch 8.0.0899: function name mch_stop_job() is confusing

Browse Source 
Problem:    Function name mch_stop_job() is confusing.
Solution:   Rename to mch_signal_job().
This commit is contained in:
Bram Moolenaar
2017-08-11 16:31:54 +02:00
parent e41e3b41f9
commit 2d33e90f81
7 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/channel.c
View File

@@ -4844,7 +4844,7 @@ job_stop_on_exit(void)
for (job = first_job; job != NULL; job = job->jv_next) for (job = first_job; job != NULL; job = job->jv_next)
if (job->jv_status == JOB_STARTED && job->jv_stoponexit != NULL) if (job->jv_status == JOB_STARTED && job->jv_stoponexit != NULL)
mch_stop_job(job, job->jv_stoponexit); mch_signal_job(job, job->jv_stoponexit);
} }
/* /*
@@ -5191,7 +5191,7 @@ job_stop(job_T *job, typval_T *argvars, char *type)
return 0; return 0;
} }
ch_log(job->jv_channel, "Stopping job with '%s'", (char *)arg); ch_log(job->jv_channel, "Stopping job with '%s'", (char *)arg);
if (mch_stop_job(job, arg) == FAIL) if (mch_signal_job(job, arg) == FAIL)
return 0; return 0;
/* Assume that only "kill" will kill the job. */ /* Assume that only "kill" will kill the job. */

2
src/os_unix.c
View File

@@ -5557,7 +5557,7 @@ mch_detect_ended_job(job_T *job_list)
* Return FAIL if "how" is not a valid name. * Return FAIL if "how" is not a valid name.
*/ */
int int
mch_stop_job(job_T *job, char_u *how) mch_signal_job(job_T *job, char_u *how)
{ {
int sig = -1; int sig = -1;
pid_t job_pid; pid_t job_pid;

2
src/os_win32.c
View File

@@ -5248,7 +5248,7 @@ theend:
* Return FAIL if it didn't work. * Return FAIL if it didn't work.
*/ */
int int
mch_stop_job(job_T *job, char_u *how) mch_signal_job(job_T *job, char_u *how)
{ {
int ret; int ret;

2
src/proto/os_unix.pro
View File

@@ -63,7 +63,7 @@ int mch_call_shell(char_u *cmd, int options);
void mch_job_start(char **argv, job_T *job, jobopt_T *options); void mch_job_start(char **argv, job_T *job, jobopt_T *options);
char *mch_job_status(job_T *job); char *mch_job_status(job_T *job);
job_T *mch_detect_ended_job(job_T *job_list); job_T *mch_detect_ended_job(job_T *job_list);
int mch_stop_job(job_T *job, char_u *how); int mch_signal_job(job_T *job, char_u *how);
void mch_clear_job(job_T *job); void mch_clear_job(job_T *job);
void mch_breakcheck(int force); void mch_breakcheck(int force);
int mch_expandpath(garray_T *gap, char_u *path, int flags); int mch_expandpath(garray_T *gap, char_u *path, int flags);

2
src/proto/os_win32.pro
View File

@@ -45,7 +45,7 @@ int mch_call_shell(char_u *cmd, int options);
void mch_job_start(char *cmd, job_T *job, jobopt_T *options); void mch_job_start(char *cmd, job_T *job, jobopt_T *options);
char *mch_job_status(job_T *job); char *mch_job_status(job_T *job);
job_T *mch_detect_ended_job(job_T *job_list); job_T *mch_detect_ended_job(job_T *job_list);
int mch_stop_job(job_T *job, char_u *how); int mch_signal_job(job_T *job, char_u *how);
void mch_clear_job(job_T *job); void mch_clear_job(job_T *job);
void mch_set_normal_colors(void); void mch_set_normal_colors(void);
void mch_write(char_u *s, int len); void mch_write(char_u *s, int len);

4
src/terminal.c
View File

@@ -1143,7 +1143,7 @@ terminal_loop(void)
/* We don't know if the job can handle CTRL-C itself or not, this /* We don't know if the job can handle CTRL-C itself or not, this
* may kill the shell instead of killing the command running in the * may kill the shell instead of killing the command running in the
* shell. */ * shell. */
mch_stop_job(curbuf->b_term->tl_job, (char_u *)"quit"); mch_signal_job(curbuf->b_term->tl_job, (char_u *)"quit");
#endif #endif
if (c == (termkey == 0 ? Ctrl_W : termkey) || c == Ctrl_BSL) if (c == (termkey == 0 ? Ctrl_W : termkey) || c == Ctrl_BSL)
@@ -2735,7 +2735,7 @@ term_report_winsize(term_T *term, int rows, int cols)
break; break;
} }
if (part < PART_COUNT && mch_report_winsize(fd, rows, cols) == OK) if (part < PART_COUNT && mch_report_winsize(fd, rows, cols) == OK)
mch_stop_job(term->tl_job, (char_u *)"winch"); mch_signal_job(term->tl_job, (char_u *)"winch");
} }
} }

2
src/version.c
View File

@@ -769,6 +769,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
899,
/**/ /**/
898, 898,
/**/ /**/