Permalink
Browse files

patch 8.0.1289: mkview always includes the local directory

Problem:    Mkview always includes the local directory.
Solution:   Add the "curdir" value in 'viewoptions'. (Eric Roberts, closes
            #2316)
  • Loading branch information...
brammool committed Nov 11, 2017
1 parent ae147ab commit 13e904199c2af6aac9b289a7f520d8e16f6e478a
Showing with 10 additions and 4 deletions.
  1. +2 −1 runtime/doc/options.txt
  2. +4 −2 src/ex_docmd.c
  3. +2 −1 src/option.c
  4. +2 −0 src/version.c
View
@@ -8387,7 +8387,7 @@ A jump table for the options with a short description can be found at |Q_op|.
security reasons.
*'viewoptions'* *'vop'*
'viewoptions' 'vop' string (default: "folds,options,cursor")
'viewoptions' 'vop' string (default: "folds,options,cursor,curdir")
global
{not in Vi}
{not available when compiled without the |+mksession|
@@ -8405,6 +8405,7 @@ A jump table for the options with a short description can be found at |Q_op|.
slashes
unix with Unix end-of-line format (single <NL>), even when
on Windows or DOS
curdir the window-local directory, if set with `:lcd`
"slash" and "unix" are useful on Windows when sharing view files
with Unix. The Unix version of Vim cannot source dos format scripts,
View
@@ -11695,9 +11695,11 @@ put_view(
}
/*
* Local directory.
* Local directory, if the current flag is not view options or the "curdir"
* option is included.
*/
if (wp->w_localdir != NULL)
if (wp->w_localdir != NULL
&& (flagp != &vop_flags || (*flagp & SSOP_CURDIR)))
{
if (fputs("lcd ", fd) < 0
|| ses_put_fname(fd, wp->w_localdir, flagp) == FAIL
View
@@ -2926,7 +2926,8 @@ static struct vimoption options[] =
{"viewoptions", "vop", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP,
#ifdef FEAT_SESSION
(char_u *)&p_vop, PV_NONE,
{(char_u *)"folds,options,cursor", (char_u *)0L}
{(char_u *)"folds,options,cursor,curdir",
(char_u *)0L}
#else
(char_u *)NULL, PV_NONE,
{(char_u *)0L, (char_u *)0L}
View
@@ -761,6 +761,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1289,
/**/
1288,
/**/

0 comments on commit 13e9041

Please sign in to comment.