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

Problem:    #ifdef for crypt feature around too many lines.
Solution:   Move code outside of #ifdef. (closes #10388)

diff --git a/src/option.c b/src/option.c
index e93c14cf41bc5bea5372bb307aafcabb5184a785..43f584d1d35f21730076d019777bcbe71a49745f 100644 (file)
--- 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 8f33f05aac2e7df800543ff488e6effac294845b..c23757fe2334a5a941a77cfdde7a8a25390f96bb 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4926,
 /**/
     4925,
 /**/