patch 7.4.697

Problem:    The filename used for ":profile" must be given literally.
Solution:   Expand "~" and environment variables. (Marco Hinz)

diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c
index 2cd762692c99f48bc480a6db72f98411e4a9f9c5..2763b69354b155b5c0bbee7a8db17dab6fe801d2 100644 (file)
--- a/src/ex_cmds2.c
+++ b/src/ex_cmds2.c
@@ -1108,7 +1108,7 @@ ex_profile(eap)
     if (len == 5 && STRNCMP(eap->arg, "start", 5) == 0 && *e != NUL)
     {
        vim_free(profile_fname);
-       profile_fname = vim_strsave(e);
+       profile_fname = expand_env_save_opt(e, TRUE);
        do_profiling = PROF_YES;
        profile_zero(&prof_wait_time);
        set_vim_var_nr(VV_PROFILING, 1L);

diff --git a/src/version.c b/src/version.c
index 21261e4d2cefe0605ed70cfec8588a011aa9bb9d..6cc84c2aefaab8d8ceb101cc0fe2ceb664b6c9ae 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    697,
 /**/
     696,
 /**/