patch 7.4.1957

Problem:    Perl interface has obsolete workaround.
Solution:   Remove the workaround added by 7.3.623. (Ken Takata)

diff --git a/src/if_perl.xs b/src/if_perl.xs
index 89aa2db124d71e3dd544331b83be49b6e9dfb88a..62b0e0074434ff507000dca50a42c27af48f3d89 100644 (file)
--- a/src/if_perl.xs
+++ b/src/if_perl.xs
@@ -135,14 +135,6 @@
 # define EXTERN_C
 #endif
 
-#if (PERL_REVISION == 5) && (PERL_VERSION >= 14) && defined(_MSC_VER)
-/* Using PL_errgv to get the error message after perl_eval_sv() causes a crash
- * with MSVC and Perl version 5.14. */
-#   define CHECK_EVAL_ERR(len) SvPV(perl_get_sv("@", GV_ADD), (len));
-#else
-#   define CHECK_EVAL_ERR(len) SvPV(GvSV(PL_errgv), (len));
-#endif
-
 /* Compatibility hacks over */
 
 static PerlInterpreter *perl_interp = NULL;
@@ -985,7 +977,7 @@ ex_perl(exarg_T *eap)
 
     SvREFCNT_dec(sv);
 
-    err = CHECK_EVAL_ERR(length);
+    err = SvPV(GvSV(PL_errgv), length);
 
     FREETMPS;
     LEAVE;
@@ -1274,7 +1266,7 @@ do_perleval(char_u *str, typval_T *rettv)
        if (sv) {
            perl_to_vim(sv, rettv);
            ref_map_free();
-           err = CHECK_EVAL_ERR(err_len);
+           err = SvPV(GvSV(PL_errgv), err_len);
        }
        PUTBACK;
        FREETMPS;
@@ -1318,7 +1310,7 @@ ex_perldo(exarg_T *eap)
     sv_catpvn(sv, "}", 1);
     perl_eval_sv(sv, G_DISCARD | G_NOARGS);
     SvREFCNT_dec(sv);
-    str = CHECK_EVAL_ERR(length);
+    str = SvPV(GvSV(PL_errgv), length);
     if (length)
        goto err;
 
@@ -1332,7 +1324,7 @@ ex_perldo(exarg_T *eap)
        sv_setpv(GvSV(PL_defgv), (char *)ml_get(i));
        PUSHMARK(sp);
        perl_call_pv("VIM::perldo", G_SCALAR | G_EVAL);
-       str = CHECK_EVAL_ERR(length);
+       str = SvPV(GvSV(PL_errgv), length);
        if (length)
            break;
        SPAGAIN;

diff --git a/src/version.c b/src/version.c
index 5e224e81b16377274b8956c638d8570311219af0..2827f24ea6ba0190706de5cdcea9a7c6ac18ed61 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -753,6 +753,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1957,
 /**/
     1956,
 /**/