diff options
-rw-r--r-- | src/buffer.c | 7 | ||||
-rw-r--r-- | src/misc2.c | 1 | ||||
-rw-r--r-- | src/os_unix.c | 4 | ||||
-rw-r--r-- | src/version.c | 2 |
4 files changed, 11 insertions, 3 deletions
diff --git a/src/buffer.c b/src/buffer.c index b013295f73..509a7bcd40 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -451,7 +451,7 @@ close_buffer( int nwindows; bufref_T bufref; # ifdef FEAT_WINDOWS - int is_curwin = (curwin!= NULL && curwin->w_buffer == buf); + int is_curwin = (curwin != NULL && curwin->w_buffer == buf); win_T *the_curwin = curwin; tabpage_T *the_curtab = curtab; # endif @@ -1649,10 +1649,11 @@ set_curbuf(buf_T *buf, int action) #ifdef FEAT_AUTOCMD if (!apply_autocmds(EVENT_BUFLEAVE, NULL, NULL, FALSE, curbuf) # ifdef FEAT_EVAL - || (bufref_valid(&bufref) && !aborting())) + || (bufref_valid(&bufref) && !aborting()) # else - || bufref_valid(&bufref)) + || bufref_valid(&bufref) # endif + ) #endif { #ifdef FEAT_SYN_HL diff --git a/src/misc2.c b/src/misc2.c index 030cff3bcf..3803249de5 100644 --- a/src/misc2.c +++ b/src/misc2.c @@ -6256,6 +6256,7 @@ has_non_ascii(char_u *s) #if defined(MESSAGE_QUEUE) || defined(PROTO) /* * Process messages that have been queued for netbeans or clientserver. + * Also check if any jobs have ended. * These functions can call arbitrary vimscript and should only be called when * it is safe to do so. */ diff --git a/src/os_unix.c b/src/os_unix.c index 6f365537c2..6b26b06203 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -5390,6 +5390,10 @@ mch_detect_ended_job(job_T *job_list) return NULL; } +/* + * Send a (deadly) signal to "job". + * Return FAIL if "how" is not a valid name. + */ int mch_stop_job(job_T *job, char_u *how) { diff --git a/src/version.c b/src/version.c index 68aff327f8..0b62f9cae9 100644 --- a/src/version.c +++ b/src/version.c @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 55, +/**/ 54, /**/ 53, |