aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-29 04:34:16 -04:00
Code Activity

patch 8.2.4926: #ifdef for crypt feature around too many lines

Browse Source 
Problem:    #ifdef for crypt feature around too many lines.
Solution:   Move code outside of #ifdef. (closes #10388)
This commit is contained in:
zeertzjq
2022-05-09 13:33:39 +01:00
committed by Bram Moolenaar
parent 53a70289c2
commit 51f0bc31d3
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/option.c
View File

@@ -4012,15 +4012,15 @@ get_option_value(
return gov_hidden_string; return gov_hidden_string;
if (stringval != NULL) if (stringval != NULL)
{ {
if ((char_u **)varp == &p_pt) // 'pastetoggle'
*stringval = str2special_save(*(char_u **)(varp), FALSE);
#ifdef FEAT_CRYPT #ifdef FEAT_CRYPT
// never return the value of the crypt key // never return the value of the crypt key
if ((char_u **)varp == &curbuf->b_p_key else if ((char_u **)varp == &curbuf->b_p_key
&& **(char_u **)(varp) != NUL) && **(char_u **)(varp) != NUL)
*stringval = vim_strsave((char_u *)"*****"); *stringval = vim_strsave((char_u *)"*****");
else if ((char_u **)varp == &p_pt) // 'pastetoggle'
*stringval = str2special_save(*(char_u **)(varp), FALSE);
else
#endif #endif
else
*stringval = vim_strsave(*(char_u **)(varp)); *stringval = vim_strsave(*(char_u **)(varp));
} }
return gov_string; return gov_string;

2
src/version.c
View File

@@ -746,6 +746,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
4926,
/**/ /**/
4925, 4925,
/**/ /**/