Mercurial > vim

changeset 9515:bb538c090668 v7.4.2038

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/9280e3f95d065733f04fa22869e5ef071d531931 Author: Bram Moolenaar <Bram@vim.org> Date: Thu Jul 14 23:03:19 2016 +0200 patch 7.4.2038 Problem: Small build still fails. Solution: Adjust more #ifdefs.
author Christian Brabandt <cb@256bit.org>
date Thu, 14 Jul 2016 23:15:05 +0200
parents 265114df6a8c
children a0898dcc7507
files src/buffer.c src/globals.h src/version.c
diffstat 3 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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
+
+    buf_hashtab_remove(buf);
+
 #ifdef FEAT_AUTOCMD
     aubuflocal_remove(buf);
 
-    buf_hashtab_remove(buf);
-
     if (autocmd_busy)
     {
 	/* Do not free the buffer structure while autocommands are executing,
--- a/src/globals.h
+++ b/src/globals.h
@@ -325,11 +325,9 @@ EXTERN int	garbage_collect_at_exit INIT(
 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 */
--- 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,