[vim] 46/139: patch 7.4.1732 Problem: Folds may close when using autocomplete. (Anmol Sethi) Solution: Increment/decrement disable_fold. (Christian Brabandt, closes #643)

[James McCoy]

This is an automated email from the git hooks/post-receive script.

jamessan pushed a commit to branch debian/sid
in repository vim.

commit 429fcfbf9a9275367fe9441a50a3dcd773497d84
Author: Bram Moolenaar <Bram at vim.org>
Date:   Thu Apr 14 16:22:04 2016 +0200

    patch 7.4.1732
    Problem:    Folds may close when using autocomplete. (Anmol Sethi)
    Solution:   Increment/decrement disable_fold. (Christian Brabandt, closes
                #643)
---
 src/edit.c    | 2 ++
 src/fold.c    | 3 +++
 src/globals.h | 4 ++++
 src/version.c | 2 ++
 4 files changed, 11 insertions(+)

diff --git a/src/edit.c b/src/edit.c
index abe26fb..f4a8354 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -1424,8 +1424,10 @@ doESCkey:
 
 docomplete:
 	    compl_busy = TRUE;
+	    disable_fold_update++;  /* don't redraw folds here */
 	    if (ins_complete(c, TRUE) == FAIL)
 		compl_cont_status = 0;
+	    disable_fold_update--;
 	    compl_busy = FALSE;
 	    break;
 #endif /* FEAT_INS_EXPAND */
diff --git a/src/fold.c b/src/fold.c
index e0b2609..8b9ca35 100644
--- a/src/fold.c
+++ b/src/fold.c
@@ -811,6 +811,9 @@ foldUpdate(win_T *wp, linenr_T top, linenr_T bot)
 {
     fold_T	*fp;
 
+    if (disable_fold_update > 0)
+	return;
+
     /* Mark all folds from top to bot as maybe-small. */
     (void)foldFind(&wp->w_folds, top, &fp);
     while (fp < (fold_T *)wp->w_folds.ga_data + wp->w_folds.ga_len
diff --git a/src/globals.h b/src/globals.h
index 3278ad9..5effdb5 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -1176,6 +1176,10 @@ EXTERN int	fill_fold INIT(= '-');
 EXTERN int	fill_diff INIT(= '-');
 #endif
 
+#ifdef FEAT_FOLDING
+EXTERN int	disable_fold_update INIT(= 0);
+#endif
+
 /* Whether 'keymodel' contains "stopsel" and "startsel". */
 EXTERN int	km_stopsel INIT(= FALSE);
 EXTERN int	km_startsel INIT(= FALSE);
diff --git a/src/version.c b/src/version.c
index 04545d9..f1dbb61 100644
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1732,
+/**/
     1731,
 /**/
     1730,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vim/vim.git