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().

diff --git a/src/channel.c b/src/channel.c
index 19d3c5dcec74ffd6a2378a3b9bbfc83be4f1b6ab..7eb6ce73e3bac970b3f0329959ed35209fe8d89e 100644 (file)
--- 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, char *type)
        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. */

diff --git a/src/os_unix.c b/src/os_unix.c
index ade8d88187547eb762a71da8fcd89dd721226c4b..141a3f0105f5c1846a35e06ca00e190f947fb36a 100644 (file)
--- 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;

diff --git a/src/os_win32.c b/src/os_win32.c
index 2ee3f2e1765dd6ff1b28273d0b2f9a065937b849..9dc039b99284c158ecc4c4e48ef7786d4b3032b9 100644 (file)
--- 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;
 

diff --git a/src/proto/os_unix.pro b/src/proto/os_unix.pro
index 8e955aa7b1c1967a0b166015fe77f85ecd55b2af..20765c06fb6c29cbfc0d93944b51255fe11572f0 100644 (file)
--- a/src/proto/os_unix.pro
+++ b/src/proto/os_unix.pro
@@ -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);
 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);

diff --git a/src/proto/os_win32.pro b/src/proto/os_win32.pro
index bc16a193aa10acc37c0450eec2b9ed31794955be..7e6953c7da89c6bbaa5c41586e29f12370a995df 100644 (file)
--- a/src/proto/os_win32.pro
+++ b/src/proto/os_win32.pro
@@ -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);
 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);

diff --git a/src/terminal.c b/src/terminal.c
index e22f7bcf755ce76db71341e534bade2a216d32ae..b22cc1a39acab3c6853ef586151ef626dbe9baf2 100644 (file)
--- 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 rows, int cols)
                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");
     }
 }
 

diff --git a/src/version.c b/src/version.c
index 8b112c600497d385d571249bd61a9703af19de40..707be4fa30e6a720f0059708a6caed929f1cd79a 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -769,6 +769,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    899,
 /**/
     898,
 /**/