diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2021-05-22 22:32:43 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-22 22:32:43 -0400 |
| commit | 3fb3b548a6c2f88e1c0c3298589e153f45e199aa (patch) | |
| tree | d0243b0e0a21550151510a30d0a4052c7f453af8 /src/nvim/ex_session.c | |
| parent | 0cbe748da34dbbd8c4db4914c9f87c500640c267 (diff) | |
| parent | 59d550345d2531b1b1058a82ae4e4de6a941f8ad (diff) | |
| download | rneovim-3fb3b548a6c2f88e1c0c3298589e153f45e199aa.tar.gz rneovim-3fb3b548a6c2f88e1c0c3298589e153f45e199aa.tar.bz2 rneovim-3fb3b548a6c2f88e1c0c3298589e153f45e199aa.zip | |
Merge pull request #14619 from janlazo/vim-8.2.2772
vim-patch:8.2.{2772,2778}
Diffstat (limited to 'src/nvim/ex_session.c')
| -rw-r--r-- | src/nvim/ex_session.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/nvim/ex_session.c b/src/nvim/ex_session.c index 9e4e69e124..c1e52d6994 100644 --- a/src/nvim/ex_session.c +++ b/src/nvim/ex_session.c @@ -937,11 +937,13 @@ void ex_mkrc(exarg_T *eap) if (!view_session || (eap->cmdidx == CMD_mksession && (*flagp & SSOP_OPTIONS))) { - failed |= (makemap(fd, NULL) == FAIL - || makeset(fd, OPT_GLOBAL, false) == FAIL); - if (p_hls && fprintf(fd, "%s", "set hlsearch\n") < 0) { - failed = true; + int flags = OPT_GLOBAL; + + if (eap->cmdidx == CMD_mksession && (*flagp & SSOP_SKIP_RTP)) { + flags |= OPT_SKIPRTP; } + failed |= (makemap(fd, NULL) == FAIL + || makeset(fd, flags, false) == FAIL); } if (!failed && view_session) { @@ -1002,6 +1004,9 @@ void ex_mkrc(exarg_T *eap) < 0) { failed = true; } + if (p_hls && fprintf(fd, "%s", "set hlsearch\n") < 0) { + failed = true; + } if (no_hlsearch && fprintf(fd, "%s", "nohlsearch\n") < 0) { failed = true; } |