Mercurial > vim

diff src/term.c @ 19489:31ac050a29a7 v8.2.0302

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.0302: setting 'term' may cause error in TermChanged autocommand Commit: https://github.com/vim/vim/commit/0c81d1b11278b2d962aa6fbb4aa974dab97be59d Author: Bram Moolenaar <Bram@vim.org> Date: Sat Feb 22 22:45:55 2020 +0100 patch 8.2.0302: setting 'term' may cause error in TermChanged autocommand Problem: Setting 'term' may cause error in TermChanged autocommand. Solution: Use aucmd_prepbuf() to switch to the buffer where the autocommand is to be executed. (closes #5682)
author Bram Moolenaar <Bram@vim.org>
date Sat, 22 Feb 2020 23:00:05 +0100
parents 08f4dc2ba716
children 22f0dda71638
line wrap: on
line diff
--- a/src/term.c
+++ b/src/term.c
@@ -2071,21 +2071,24 @@ set_termname(char_u *term)
 	check_map_keycodes();	// check mappings for terminal codes used
 
 	{
-	    bufref_T	old_curbuf;
+	    buf_T	*buf;
+	    aco_save_T	aco;
 
 	    /*
 	     * Execute the TermChanged autocommands for each buffer that is
 	     * loaded.
 	     */
-	    set_bufref(&old_curbuf, curbuf);
-	    FOR_ALL_BUFFERS(curbuf)
+	    FOR_ALL_BUFFERS(buf)
 	    {
 		if (curbuf->b_ml.ml_mfp != NULL)
+		{
+		    aucmd_prepbuf(&aco, buf);
 		    apply_autocmds(EVENT_TERMCHANGED, NULL, NULL, FALSE,
 								      curbuf);
+		    // restore curwin/curbuf and a few other things
+		    aucmd_restbuf(&aco);
+		}
 	    }
-	    if (bufref_valid(&old_curbuf))
-		curbuf = old_curbuf.br_buf;
 	}
     }