From 163add40b8b98b91dfb8eff589f49dc75f1032ea Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Fri, 16 Feb 2024 06:56:12 +0800 Subject: vim-patch:9.1.0113: duplicate code when cleaning undo stack Problem: duplicate code when cleaning undo stack Solution: refactor undo cleanup into a single public function related: vim/vim#13928 https://github.com/vim/vim/commit/9071ed8107244e0c56a16b77d1c28e975cb21dd2 Co-authored-by: Christian Brabandt --- src/nvim/buffer.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/nvim/buffer.c') diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c index 38c3ee13aa..bf1d2ac6dd 100644 --- a/src/nvim/buffer.c +++ b/src/nvim/buffer.c @@ -843,8 +843,9 @@ void buf_freeall(buf_T *buf, int flags) ml_close(buf, true); // close and delete the memline/memfile buf->b_ml.ml_line_count = 0; // no lines in buffer if ((flags & BFA_KEEP_UNDO) == 0) { - u_blockfree(buf); // free the memory allocated for undo - u_clearall(buf); // reset all undo information + // free the memory allocated for undo + // and reset all undo information + u_clearallandblockfree(buf); } syntax_clear(&buf->b_s); // reset syntax info buf->b_flags &= ~BF_READERR; // a read error is no longer relevant -- cgit