To: vim_dev@googlegroups.com
Subject: Patch 8.2.4926
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.4926
Problem:    #ifdef for crypt feature around too many lines.
Solution:   Move code outside of #ifdef. (closes #10388)
Files:      src/option.c


*** ../vim-8.2.4925/src/option.c	2022-05-09 12:16:14.761073336 +0100
--- src/option.c	2022-05-09 13:32:01.254227489 +0100
***************
*** 4012,4026 ****
  	    return gov_hidden_string;
  	if (stringval != NULL)
  	{
  #ifdef FEAT_CRYPT
  	    // never return the value of the crypt key
! 	    if ((char_u **)varp == &curbuf->b_p_key
  						&& **(char_u **)(varp) != NUL)
  		*stringval = vim_strsave((char_u *)"*****");
- 	    else if ((char_u **)varp == &p_pt)	// 'pastetoggle'
- 		*stringval = str2special_save(*(char_u **)(varp), FALSE);
- 	    else
  #endif
  		*stringval = vim_strsave(*(char_u **)(varp));
  	}
  	return gov_string;
--- 4012,4026 ----
  	    return gov_hidden_string;
  	if (stringval != NULL)
  	{
+ 	    if ((char_u **)varp == &p_pt)	// 'pastetoggle'
+ 		*stringval = str2special_save(*(char_u **)(varp), FALSE);
  #ifdef FEAT_CRYPT
  	    // never return the value of the crypt key
! 	    else if ((char_u **)varp == &curbuf->b_p_key
  						&& **(char_u **)(varp) != NUL)
  		*stringval = vim_strsave((char_u *)"*****");
  #endif
+ 	    else
  		*stringval = vim_strsave(*(char_u **)(varp));
  	}
  	return gov_string;
*** ../vim-8.2.4925/src/version.c	2022-05-09 13:15:03.714800119 +0100
--- src/version.c	2022-05-09 13:30:48.298272982 +0100
***************
*** 748,749 ****
--- 748,751 ----
  {   /* Add new patch number below this line */
+ /**/
+     4926,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
148. You find it easier to dial-up the National Weather Service
     Weather/your_town/now.html than to simply look out the window.

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