Mercurial > vim
changeset 12037:85f0f557661e v8.0.0899
patch 8.0.0899: function name mch_stop_job() is confusing
commit https://github.com/vim/vim/commit/2d33e90f81334eee34275a259444434abf56250f
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Aug 11 16:31:54 2017 +0200
patch 8.0.0899: function name mch_stop_job() is confusing
Problem: Function name mch_stop_job() is confusing.
Solution: Rename to mch_signal_job().
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Fri, 11 Aug 2017 16:45:04 +0200 |
| parents | a6237fdb8469 |
| children | 5399641f85c3 |
| files | src/channel.c src/os_unix.c src/os_win32.c src/proto/os_unix.pro src/proto/os_win32.pro src/terminal.c src/version.c |
| diffstat | 7 files changed, 10 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/channel.c +++ b/src/channel.c @@ -4844,7 +4844,7 @@ job_stop_on_exit(void) for (job = first_job; job != NULL; job = job->jv_next) 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, return 0; } 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; /* Assume that only "kill" will kill the job. */
--- a/src/os_unix.c +++ b/src/os_unix.c @@ -5557,7 +5557,7 @@ mch_detect_ended_job(job_T *job_list) * Return FAIL if "how" is not a valid name. */ int -mch_stop_job(job_T *job, char_u *how) +mch_signal_job(job_T *job, char_u *how) { int sig = -1; pid_t job_pid;
--- a/src/os_win32.c +++ b/src/os_win32.c @@ -5248,7 +5248,7 @@ theend: * Return FAIL if it didn't work. */ int -mch_stop_job(job_T *job, char_u *how) +mch_signal_job(job_T *job, char_u *how) { int ret;
--- a/src/proto/os_unix.pro +++ b/src/proto/os_unix.pro @@ -63,7 +63,7 @@ int mch_call_shell(char_u *cmd, int opti void mch_job_start(char **argv, job_T *job, jobopt_T *options); char *mch_job_status(job_T *job); 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_breakcheck(int force); int mch_expandpath(garray_T *gap, char_u *path, int flags);
--- a/src/proto/os_win32.pro +++ b/src/proto/os_win32.pro @@ -45,7 +45,7 @@ int mch_call_shell(char_u *cmd, int opti void mch_job_start(char *cmd, job_T *job, jobopt_T *options); char *mch_job_status(job_T *job); 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_set_normal_colors(void); void mch_write(char_u *s, int len);
--- a/src/terminal.c +++ b/src/terminal.c @@ -1143,7 +1143,7 @@ terminal_loop(void) /* 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 * shell. */ - mch_stop_job(curbuf->b_term->tl_job, (char_u *)"quit"); + mch_signal_job(curbuf->b_term->tl_job, (char_u *)"quit"); #endif if (c == (termkey == 0 ? Ctrl_W : termkey) || c == Ctrl_BSL) @@ -2735,7 +2735,7 @@ term_report_winsize(term_T *term, int ro break; } 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"); } }