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

Patch 9.0.1459
Problem:    Typo in name of type.
Solution:   Change funccal_T to funccall_T. (closes #12265)
Files:      src/blob.c, src/dict.c, src/list.c, src/strings.c, src/structs.h


*** ../vim-9.0.1458/src/blob.c	2023-03-19 21:23:34.693796404 +0000
--- src/blob.c	2023-04-16 20:53:15.773185543 +0100
***************
*** 629,635 ****
      if (b->bv_lock == 0)
  	b->bv_lock = VAR_LOCKED;
  
!     // Create one funccal_T for all eval_expr_typval() calls.
      fc = eval_expr_get_funccal(expr, &newtv);
  
      for (i = 0; i < b->bv_ga.ga_len; i++)
--- 629,635 ----
      if (b->bv_lock == 0)
  	b->bv_lock = VAR_LOCKED;
  
!     // Create one funccall_T for all eval_expr_typval() calls.
      fc = eval_expr_get_funccal(expr, &newtv);
  
      for (i = 0; i < b->bv_ga.ga_len; i++)
*** ../vim-9.0.1458/src/dict.c	2023-03-19 21:23:34.693796404 +0000
--- src/dict.c	2023-04-16 20:49:26.605270626 +0100
***************
*** 904,910 ****
  eval_dict(char_u **arg, typval_T *rettv, evalarg_T *evalarg, int literal)
  {
      int		evaluate = evalarg == NULL ? FALSE
! 					 : evalarg->eval_flags & EVAL_EVALUATE;
      dict_T	*d = NULL;
      typval_T	tvkey;
      typval_T	tv;
--- 904,910 ----
  eval_dict(char_u **arg, typval_T *rettv, evalarg_T *evalarg, int literal)
  {
      int		evaluate = evalarg == NULL ? FALSE
! 				       : (evalarg->eval_flags & EVAL_EVALUATE);
      dict_T	*d = NULL;
      typval_T	tvkey;
      typval_T	tv;
***************
*** 1359,1365 ****
  	d_ret = rettv->vval.v_dict;
      }
  
!     // Create one funccal_T for all eval_expr_typval() calls.
      fc = eval_expr_get_funccal(expr, &newtv);
  
      int prev_lock = d->dv_lock;
--- 1359,1365 ----
  	d_ret = rettv->vval.v_dict;
      }
  
!     // Create one funccall_T for all eval_expr_typval() calls.
      fc = eval_expr_get_funccal(expr, &newtv);
  
      int prev_lock = d->dv_lock;
*** ../vim-9.0.1458/src/list.c	2023-03-19 21:23:34.693796404 +0000
--- src/list.c	2023-04-16 20:49:26.605270626 +0100
***************
*** 2401,2407 ****
      if (l->lv_lock == 0)
  	l->lv_lock = VAR_LOCKED;
  
!     // Create one funccal_T for all eval_expr_typval() calls.
      fc = eval_expr_get_funccal(expr, &newtv);
  
      if (l->lv_first == &range_list_item)
--- 2401,2407 ----
      if (l->lv_lock == 0)
  	l->lv_lock = VAR_LOCKED;
  
!     // Create one funccall_T for all eval_expr_typval() calls.
      fc = eval_expr_get_funccal(expr, &newtv);
  
      if (l->lv_first == &range_list_item)
***************
*** 3064,3070 ****
      if (l == NULL)
  	return;
  
!     // Create one funccal_T for all eval_expr_typval() calls.
      fc = eval_expr_get_funccal(expr, rettv);
  
      prev_locked = l->lv_lock;
--- 3064,3070 ----
      if (l == NULL)
  	return;
  
!     // Create one funccall_T for all eval_expr_typval() calls.
      fc = eval_expr_get_funccal(expr, rettv);
  
      prev_locked = l->lv_lock;
*** ../vim-9.0.1458/src/strings.c	2023-03-04 20:47:32.304617857 +0000
--- src/strings.c	2023-04-16 20:49:26.605270626 +0100
***************
*** 902,908 ****
      // set_vim_var_nr() doesn't set the type
      set_vim_var_type(VV_KEY, VAR_NUMBER);
  
!     // Create one funccal_T for all eval_expr_typval() calls.
      fc = eval_expr_get_funccal(expr, &newtv);
  
      ga_init2(&ga, sizeof(char), 80);
--- 902,908 ----
      // set_vim_var_nr() doesn't set the type
      set_vim_var_type(VV_KEY, VAR_NUMBER);
  
!     // Create one funccall_T for all eval_expr_typval() calls.
      fc = eval_expr_get_funccal(expr, &newtv);
  
      ga_init2(&ga, sizeof(char), 80);
***************
*** 981,987 ****
      else
  	copy_tv(&argvars[2], rettv);
  
!     // Create one funccal_T for all eval_expr_typval() calls.
      fc = eval_expr_get_funccal(expr, rettv);
  
      for ( ; *p != NUL; p += len)
--- 981,987 ----
      else
  	copy_tv(&argvars[2], rettv);
  
!     // Create one funccall_T for all eval_expr_typval() calls.
      fc = eval_expr_get_funccal(expr, rettv);
  
      for ( ; *p != NUL; p += len)
*** ../vim-9.0.1458/src/structs.h	2023-04-14 21:54:21.092430693 +0100
--- src/structs.h	2023-04-16 20:49:26.605270626 +0100
***************
*** 1896,1902 ****
  				// funccal
      int		fc_copyID;	// for garbage collection
      garray_T	fc_ufuncs;	// list of ufunc_T* which keep a reference to
! 				// "func"
  };
  
  // structure used as item in "fc_defer"
--- 1896,1902 ----
  				// funccal
      int		fc_copyID;	// for garbage collection
      garray_T	fc_ufuncs;	// list of ufunc_T* which keep a reference to
! 				// "fc_func"
  };
  
  // structure used as item in "fc_defer"
*** ../vim-9.0.1458/src/version.c	2023-04-16 20:13:08.945947222 +0100
--- src/version.c	2023-04-16 20:50:54.221239977 +0100
***************
*** 697,698 ****
--- 697,700 ----
  {   /* Add new patch number below this line */
+ /**/
+     1459,
  /**/

-- 
Every exit is an entrance into something else.

 /// 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    ///