patch 7.4.2038

Problem:    Small build still fails.
Solution:   Adjust more #ifdefs.

diff --git a/src/buffer.c b/src/buffer.c
index 65ab22fc83437f556600da75e8ecf2e3524eb2d2..99d23ec5dfa7289a645662ffb1f9ea5f4120f1b1 100644 (file)
--- 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 566d6e13bb7bc58f15c4b4c754c4197d805bb7b1..b89cac243fcd1fc62d083be9d14a7f967b4f0804 100644 (file)
--- 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 45aada0f69cda0cff952afe998d41677a8051116..e840be827fd3e966cb921804334f31d11672bb61 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2038,
 /**/
     2037,
 /**/