To: vim_dev@googlegroups.com
Subject: Patch 9.0.0921
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.0921
Problem:    Missing defined(PROTO) in #ifdef.
Solution:   Adjust #ifdef so that proto works with different features.
            Clean up some preprocessor indenting.
Files:      src/option.c


*** ../vim-9.0.0920/src/option.c	2022-11-05 18:28:52.047344298 +0000
--- src/option.c	2022-11-22 18:17:42.149715835 +0000
***************
*** 3925,3931 ****
      return opt_idx;
  }
  
! #if defined(FEAT_EVAL) || defined(FEAT_TCL) || defined(FEAT_MZSCHEME) || defined(FEAT_SPELL)
  /*
   * Get the value for an option.
   *
--- 3925,3932 ----
      return opt_idx;
  }
  
! #if defined(FEAT_EVAL) || defined(FEAT_TCL) || defined(FEAT_MZSCHEME) \
! 	|| defined(FEAT_SPELL) || defined(PROTO)
  /*
   * Get the value for an option.
   *
***************
*** 4127,4140 ****
  		*numval = bufIsChanged((buf_T *)from);
  		varp = NULL;
  	    }
! #ifdef FEAT_CRYPT
  	    else if (p->indir == PV_KEY)
  	    {
  		// never return the value of the crypt key
  		*stringval = NULL;
  		varp = NULL;
  	    }
! #endif
  	    else
  	    {
  		buf_T *save_curbuf = curbuf;
--- 4128,4141 ----
  		*numval = bufIsChanged((buf_T *)from);
  		varp = NULL;
  	    }
! # ifdef FEAT_CRYPT
  	    else if (p->indir == PV_KEY)
  	    {
  		// never return the value of the crypt key
  		*stringval = NULL;
  		varp = NULL;
  	    }
! # endif
  	    else
  	    {
  		buf_T *save_curbuf = curbuf;
***************
*** 5151,5179 ****
  	case PV_SO:
  	    curwin->w_p_so = -1;
  	    break;
! #ifdef FEAT_FIND_ID
  	case PV_DEF:
  	    clear_string_option(&buf->b_p_def);
  	    break;
  	case PV_INC:
  	    clear_string_option(&buf->b_p_inc);
  	    break;
! #endif
  	case PV_DICT:
  	    clear_string_option(&buf->b_p_dict);
  	    break;
  	case PV_TSR:
  	    clear_string_option(&buf->b_p_tsr);
  	    break;
! #ifdef FEAT_COMPL_FUNC
  	case PV_TSRFU:
  	    clear_string_option(&buf->b_p_tsrfu);
  	    break;
! #endif
  	case PV_FP:
  	    clear_string_option(&buf->b_p_fp);
  	    break;
! #ifdef FEAT_QUICKFIX
  	case PV_EFM:
  	    clear_string_option(&buf->b_p_efm);
  	    break;
--- 5152,5180 ----
  	case PV_SO:
  	    curwin->w_p_so = -1;
  	    break;
! # ifdef FEAT_FIND_ID
  	case PV_DEF:
  	    clear_string_option(&buf->b_p_def);
  	    break;
  	case PV_INC:
  	    clear_string_option(&buf->b_p_inc);
  	    break;
! # endif
  	case PV_DICT:
  	    clear_string_option(&buf->b_p_dict);
  	    break;
  	case PV_TSR:
  	    clear_string_option(&buf->b_p_tsr);
  	    break;
! # ifdef FEAT_COMPL_FUNC
  	case PV_TSRFU:
  	    clear_string_option(&buf->b_p_tsrfu);
  	    break;
! # endif
  	case PV_FP:
  	    clear_string_option(&buf->b_p_fp);
  	    break;
! # ifdef FEAT_QUICKFIX
  	case PV_EFM:
  	    clear_string_option(&buf->b_p_efm);
  	    break;
***************
*** 5183,5209 ****
  	case PV_MP:
  	    clear_string_option(&buf->b_p_mp);
  	    break;
! #endif
! #if defined(FEAT_BEVAL) && defined(FEAT_EVAL)
  	case PV_BEXPR:
  	    clear_string_option(&buf->b_p_bexpr);
  	    break;
! #endif
! #if defined(FEAT_CRYPT)
  	case PV_CM:
  	    clear_string_option(&buf->b_p_cm);
  	    break;
! #endif
! #ifdef FEAT_LINEBREAK
  	case PV_SBR:
  	    clear_string_option(&((win_T *)from)->w_p_sbr);
  	    break;
! #endif
! #ifdef FEAT_STL_OPT
  	case PV_STL:
  	    clear_string_option(&((win_T *)from)->w_p_stl);
  	    break;
! #endif
  	case PV_UL:
  	    buf->b_p_ul = NO_LOCAL_UNDOLEVEL;
  	    break;
--- 5184,5210 ----
  	case PV_MP:
  	    clear_string_option(&buf->b_p_mp);
  	    break;
! # endif
! # if defined(FEAT_BEVAL) && defined(FEAT_EVAL)
  	case PV_BEXPR:
  	    clear_string_option(&buf->b_p_bexpr);
  	    break;
! # endif
! # if defined(FEAT_CRYPT)
  	case PV_CM:
  	    clear_string_option(&buf->b_p_cm);
  	    break;
! # endif
! # ifdef FEAT_LINEBREAK
  	case PV_SBR:
  	    clear_string_option(&((win_T *)from)->w_p_sbr);
  	    break;
! # endif
! # ifdef FEAT_STL_OPT
  	case PV_STL:
  	    clear_string_option(&((win_T *)from)->w_p_stl);
  	    break;
! # endif
  	case PV_UL:
  	    buf->b_p_ul = NO_LOCAL_UNDOLEVEL;
  	    break;
***************
*** 6875,6882 ****
  #ifdef FEAT_VARTABS
  		if (buf->b_p_vsts_nopaste)
  		    vim_free(buf->b_p_vsts_nopaste);
! 		buf->b_p_vsts_nopaste = buf->b_p_vsts && buf->b_p_vsts != empty_option
! 				     ? vim_strsave(buf->b_p_vsts) : NULL;
  #endif
  	    }
  
--- 6876,6884 ----
  #ifdef FEAT_VARTABS
  		if (buf->b_p_vsts_nopaste)
  		    vim_free(buf->b_p_vsts_nopaste);
! 		buf->b_p_vsts_nopaste =
! 			buf->b_p_vsts && buf->b_p_vsts != empty_option
! 					   ? vim_strsave(buf->b_p_vsts) : NULL;
  #endif
  	    }
  
***************
*** 6897,6903 ****
  #ifdef FEAT_VARTABS
  	    if (p_vsts_nopaste)
  		vim_free(p_vsts_nopaste);
! 	    p_vsts_nopaste = p_vsts && p_vsts != empty_option ? vim_strsave(p_vsts) : NULL;
  #endif
  	}
  
--- 6899,6906 ----
  #ifdef FEAT_VARTABS
  	    if (p_vsts_nopaste)
  		vim_free(p_vsts_nopaste);
! 	    p_vsts_nopaste = p_vsts && p_vsts != empty_option
! 						  ? vim_strsave(p_vsts) : NULL;
  #endif
  	}
  
*** ../vim-9.0.0920/src/version.c	2022-11-22 18:12:40.833924528 +0000
--- src/version.c	2022-11-22 18:13:42.533880206 +0000
***************
*** 697,698 ****
--- 697,700 ----
  {   /* Add new patch number below this line */
+ /**/
+     921,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
111. You and your friends get together regularly on IRC, even though
     all of you live in the same street.

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