summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-06-25 23:40:29 +0200
committerBram Moolenaar <Bram@vim.org>2019-06-25 23:40:29 +0200
commit2eed9bafa013f278ffe8bcd52489f90b11cf00e1 (patch)
tree9a2dcd1d2b0efacc4564f212baccba596d51e4f1
parent6a7af8e2dbcb768a768831d9e6355c855c215ebc (diff)
downloadvim-git-2eed9bafa013f278ffe8bcd52489f90b11cf00e1.tar.gz
patch 8.1.1594: may still start file dialog while exitingv8.1.1594
Problem: May still start file dialog while exiting. Solution: Ignore the "browse" modifier in another place when exiiting. (Ozaki Kiichi, closes #4582)
-rw-r--r--src/ex_cmds.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 0eaa662b2..4126fe09f 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -3818,7 +3818,7 @@ do_ecmd(
else
{
#ifdef FEAT_BROWSE
- if (cmdmod.browse)
+ if (cmdmod.browse && !exiting)
{
if (
# ifdef FEAT_GUI
diff --git a/src/version.c b/src/version.c
index c25c1ff10..369962921 100644
--- a/src/version.c
+++ b/src/version.c
@@ -778,6 +778,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1594,
+/**/
1593,
/**/
1592,