summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/option.c8
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 4 deletions
diff --git a/src/option.c b/src/option.c
index e93c14cf4..43f584d1d 100644
--- a/src/option.c
+++ b/src/option.c
@@ -4012,15 +4012,15 @@ get_option_value(
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
- if ((char_u **)varp == &curbuf->b_p_key
+ else 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
+ else
*stringval = vim_strsave(*(char_u **)(varp));
}
return gov_string;
diff --git a/src/version.c b/src/version.c
index 8f33f05aa..c23757fe2 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 4926,
+/**/
4925,
/**/
4924,