To: vim_dev@googlegroups.com
Subject: Patch 8.2.2976
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 8.2.2976 (after 8.2.2975)
Problem:    Build failure without the +eval feature.
Solution:   Add #ifdefs.
Files:      src/scriptfile.c


*** ../vim-8.2.2975/src/scriptfile.c	2021-06-11 22:05:43.490401734 +0200
--- src/scriptfile.c	2021-06-11 22:20:32.916069737 +0200
***************
*** 1119,1124 ****
--- 1119,1125 ----
      int			    save_debug_break_level = debug_break_level;
      int			    sid;
      scriptitem_T	    *si = NULL;
+     int			    save_estack_compiling = estack_compiling;
  #endif
  #ifdef STARTUPTIME
      struct timeval	    tv_rel;
***************
*** 1128,1134 ****
      proftime_T		    wait_start;
  #endif
      int			    trigger_source_post = FALSE;
-     int			    save_estack_compiling = estack_compiling;
      ESTACK_CHECK_DECLARATION
  
      p = expand_env_save(fname);
--- 1129,1134 ----
***************
*** 1143,1151 ****
  	smsg(_("Cannot source a directory: \"%s\""), fname);
  	goto theend;
      }
      estack_compiling = FALSE;
  
- #ifdef FEAT_EVAL
      // See if we loaded this script before.
      for (sid = script_items.ga_len; sid > 0; --sid)
      {
--- 1143,1151 ----
  	smsg(_("Cannot source a directory: \"%s\""), fname);
  	goto theend;
      }
+ #ifdef FEAT_EVAL
      estack_compiling = FALSE;
  
      // See if we loaded this script before.
      for (sid = script_items.ga_len; sid > 0; --sid)
      {
***************
*** 1510,1516 ****
--- 1510,1518 ----
  
  theend:
      vim_free(fname_exp);
+ #ifdef FEAT_EVAL
      estack_compiling = save_estack_compiling;
+ #endif
      return retval;
  }
  
*** ../vim-8.2.2975/src/version.c	2021-06-11 22:05:43.490401734 +0200
--- src/version.c	2021-06-11 22:21:10.963970011 +0200
***************
*** 752,753 ****
--- 752,755 ----
  {   /* Add new patch number below this line */
+ /**/
+     2976,
  /**/

-- 
ARTHUR:    ... and I am your king ....
OLD WOMAN: Ooooh!  I didn't know we had a king.  I thought we were an
           autonomous collective ...
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///                                                                      \\\
\\\        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///