diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-07-14 23:03:19 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-07-14 23:03:19 +0200 |
| commit | 9280e3f95d065733f04fa22869e5ef071d531931 (patch) | |
| tree | ee983f345b75b42eabb807e75871cae8f58d92bd /src | |
| parent | 7399895520b3248d5751c8dba8b9a4f27522d2dd (diff) | |
| download | vim-git-9280e3f95d065733f04fa22869e5ef071d531931.tar.gz | |
patch 7.4.2038v7.4.2038
Problem: Small build still fails.
Solution: Adjust more #ifdefs.
Diffstat (limited to 'src')
| -rw-r--r-- | src/buffer.c | 5 | ||||
| -rw-r--r-- | src/globals.h | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/buffer.c b/src/buffer.c index 65ab22fc8..99d23ec5d 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -743,11 +743,12 @@ free_buffer(buf_T *buf) #ifdef FEAT_JOB_CHANNEL channel_buffer_free(buf); #endif -#ifdef FEAT_AUTOCMD - aubuflocal_remove(buf); buf_hashtab_remove(buf); +#ifdef FEAT_AUTOCMD + aubuflocal_remove(buf); + if (autocmd_busy) { /* Do not free the buffer structure while autocommands are executing, diff --git a/src/globals.h b/src/globals.h index 566d6e13b..b89cac243 100644 --- a/src/globals.h +++ b/src/globals.h @@ -325,11 +325,9 @@ EXTERN int garbage_collect_at_exit INIT(= FALSE); EXTERN scid_T current_SID INIT(= 0); #endif -#if defined(FEAT_EVAL) || defined(FEAT_SYN_HL) /* Magic number used for hashitem "hi_key" value indicating a deleted item. * Only the address is used. */ EXTERN char_u hash_removed; -#endif EXTERN int scroll_region INIT(= FALSE); /* term supports scroll region */ diff --git a/src/version.c b/src/version.c index 45aada0f6..e840be827 100644 --- a/src/version.c +++ b/src/version.c @@ -759,6 +759,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2038, +/**/ 2037, /**/ 2036, |