Merge remote-tracking branch 'vim/master'

ychin · ychin · commit f0d844930f54 · 2020-03-29T16:35:29.000-07:00
diff --git a/runtime/menu.vim b/runtime/menu.vim
@@ -2,7 +2,7 @@
 " You can also use this as a start for your own set of menus.
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2020 Mar 19
+" Last Change:	2020 Mar 29
 
 " Note that ":an" (short for ":anoremenu") is often used to make a menu work
 " in all modes and avoid side effects from mappings defined by the user.
@@ -727,7 +727,7 @@ func s:BMAdd()
       call s:BMShow()
     else
       let name = expand("<afile>")
-      let num = expand("<abuf>")
+      let num = expand("<abuf>") + 0 " add zero to convert to a number type
       if s:BMCanAdd(name, num)
 	call <SID>BMFilename(name, num)
 	let s:bmenu_count += 1
diff --git a/src/evalvars.c b/src/evalvars.c
@@ -3463,7 +3463,6 @@ f_getwinvar(typval_T *argvars, typval_T *rettv)
 f_getbufvar(typval_T *argvars, typval_T *rettv)
 {
     buf_T	*buf;
-    buf_T	*save_curbuf;
     char_u	*varname;
     dictitem_T	*v;
     int		done = FALSE;
@@ -3478,12 +3477,13 @@ f_getbufvar(typval_T *argvars, typval_T *rettv)
 
     if (buf != NULL && varname != NULL)
     {
-	// set curbuf to be our buf, temporarily
-	save_curbuf = curbuf;
-	curbuf = buf;
-
 	if (*varname == '&')
 	{
+	    buf_T	*save_curbuf = curbuf;
+
+	    // set curbuf to be our buf, temporarily
+	    curbuf = buf;
+
 	    if (varname[1] == NUL)
 	    {
 		// get all buffer-local options in a dict
@@ -3498,22 +3498,21 @@ f_getbufvar(typval_T *argvars, typval_T *rettv)
 	    else if (get_option_tv(&varname, rettv, TRUE) == OK)
 		// buffer-local-option
 		done = TRUE;
+
+	    // restore previous notion of curbuf
+	    curbuf = save_curbuf;
 	}
 	else
 	{
 	    // Look up the variable.
 	    // Let getbufvar({nr}, "") return the "b:" dictionary.
-	    v = find_var_in_ht(&curbuf->b_vars->dv_hashtab,
-							 'b', varname, FALSE);
+	    v = find_var_in_ht(&buf->b_vars->dv_hashtab, 'b', varname, FALSE);
 	    if (v != NULL)
 	    {
 		copy_tv(&v->di_tv, rettv);
 		done = TRUE;
 	    }
 	}
-
-	// restore previous notion of curbuf
-	curbuf = save_curbuf;
     }
 
     if (!done && argvars[2].v_type != VAR_UNKNOWN)
@@ -3620,11 +3619,11 @@ f_setbufvar(typval_T *argvars, typval_T *rettv UNUSED)
 	}
 	else
 	{
-	    buf_T *save_curbuf = curbuf;
-
 	    bufvarname = alloc(STRLEN(varname) + 3);
 	    if (bufvarname != NULL)
 	    {
+		buf_T *save_curbuf = curbuf;
+
 		curbuf = buf;
 		STRCPY(bufvarname, "b:");
 		STRCPY(bufvarname + 2, varname);
diff --git a/src/fileio.c b/src/fileio.c
@@ -261,11 +261,21 @@ readfile(
 	{
 	    if (apply_autocmds_exarg(EVENT_BUFREADCMD, NULL, sfname,
 							  FALSE, curbuf, eap))
+	    {
+		int status = OK;
 #ifdef FEAT_EVAL
-		return aborting() ? FAIL : OK;
-#else
-		return OK;
-#endif
+		if (aborting())
+		    status = FAIL;
+#endif
+		// The BufReadCmd code usually uses ":read" to get the text and
+		// perhaps ":file" to change the buffer name. But we should
+		// consider this to work like ":edit", thus reset the
+		// BF_NOTEDITED flag.  Then ":write" will work to overwrite the
+		// same file.
+		if (status == OK)
+		    curbuf->b_flags &= ~BF_NOTEDITED;
+		return status;
+	    }
 	}
 	else if (apply_autocmds_exarg(EVENT_FILEREADCMD, sfname, sfname,
 							    FALSE, NULL, eap))
diff --git a/src/if_lua.c b/src/if_lua.c
@@ -398,16 +398,6 @@ static const luaV_Reg luaV_dll[] = {
 
 static HANDLE hinstLua = NULL;
 
-    static void
-end_dynamic_lua(void)
-{
-    if (hinstLua)
-    {
-	close_dll(hinstLua);
-	hinstLua = 0;
-    }
-}
-
     static int
 lua_link_init(char *libname, int verbose)
 {
@@ -2121,9 +2111,6 @@ lua_end(void)
     {
 	lua_close(L);
 	L = NULL;
-#ifdef DYNAMIC_LUA
-	end_dynamic_lua();
-#endif
     }
 }
 
diff --git a/src/if_perl.xs b/src/if_perl.xs
@@ -762,7 +762,7 @@ perl_init(void)
 }
 
 /*
- * perl_end(): clean up after ourselves
+ * Clean up after ourselves.
  */
     void
 perl_end(void)
@@ -777,13 +777,6 @@ perl_end(void)
 	Perl_sys_term();
 #endif
     }
-#ifdef DYNAMIC_PERL
-    if (hPerlLib)
-    {
-	close_dll(hPerlLib);
-	hPerlLib = NULL;
-    }
-#endif
 }
 
 /*
diff --git a/src/if_python.c b/src/if_python.c
@@ -654,19 +654,6 @@ static struct
     {"", NULL},
 };
 
-/*
- * Free python.dll
- */
-    static void
-end_dynamic_python(void)
-{
-    if (hinstPython)
-    {
-	close_dll(hinstPython);
-	hinstPython = 0;
-    }
-}
-
 /*
  * Load library and get all pointers.
  * Parameter 'libname' provides name of DLL.
@@ -889,7 +876,6 @@ python_end(void)
 # endif
 	Py_Finalize();
     }
-    end_dynamic_python();
 #else
     if (Py_IsInitialized())
     {
diff --git a/src/if_python3.c b/src/if_python3.c
@@ -634,19 +634,6 @@ py3__Py_XDECREF(PyObject *op)
 #  define Py_XDECREF(op) py3__Py_XDECREF(_PyObject_CAST(op))
 # endif
 
-/*
- * Free python.dll
- */
-    static void
-end_dynamic_python3(void)
-{
-    if (hinstPy3 != 0)
-    {
-	close_dll(hinstPy3);
-	hinstPy3 = 0;
-    }
-}
-
 /*
  * Load library and get all pointers.
  * Parameter 'libname' provides name of DLL.
@@ -873,10 +860,6 @@ python3_end(void)
 	Py_Finalize();
     }
 
-#ifdef DYNAMIC_PYTHON3
-    end_dynamic_python3();
-#endif
-
     --recurse;
 }
 
diff --git a/src/if_ruby.c b/src/if_ruby.c
@@ -735,19 +735,6 @@ static struct
     {"", NULL},
 };
 
-/*
- * Free ruby.dll
- */
-    static void
-end_dynamic_ruby(void)
-{
-    if (hinstRuby)
-    {
-	close_dll(hinstRuby);
-	hinstRuby = NULL;
-    }
-}
-
 /*
  * Load library and get all pointers.
  * Parameter 'libname' provides name of DLL.
@@ -797,9 +784,6 @@ ruby_enabled(int verbose)
     void
 ruby_end(void)
 {
-#ifdef DYNAMIC_RUBY
-    end_dynamic_ruby();
-#endif
 }
 
     void
diff --git a/src/if_tcl.c b/src/if_tcl.c
@@ -280,13 +280,6 @@ tcl_enabled(int verbose)
     void
 tcl_end(void)
 {
-#ifdef DYNAMIC_TCL
-    if (hTclLib)
-    {
-	close_dll(hTclLib);
-	hTclLib = NULL;
-    }
-#endif
 }
 
 /////////////////////////////////////////////////////////////////////////////
diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim
@@ -1536,6 +1536,40 @@ func Test_Cmd_Autocmds()
   enew!
 endfunc
 
+func s:ReadFile()
+  setl noswapfile nomodified
+  let filename = resolve(expand("<afile>:p"))
+  execute 'read' fnameescape(filename)
+  1d_
+  exe 'file' fnameescape(filename)
+  setl buftype=acwrite
+endfunc
+
+func s:WriteFile()
+  let filename = resolve(expand("<afile>:p"))
+  setl buftype=
+  noautocmd execute 'write' fnameescape(filename)
+  setl buftype=acwrite
+  setl nomodified
+endfunc
+
+func Test_BufReadCmd()
+  autocmd BufReadCmd *.test call s:ReadFile()
+  autocmd BufWriteCmd *.test call s:WriteFile()
+
+  call writefile(['one', 'two', 'three'], 'Xcmd.test')
+  edit Xcmd.test
+  call assert_match('Xcmd.test" line 1 of 3', execute('file'))
+  normal! Gofour
+  write
+  call assert_equal(['one', 'two', 'three', 'four'], readfile('Xcmd.test'))
+
+  bwipe!
+  call delete('Xcmd.test')
+  au! BufReadCmd
+  au! BufWriteCmd
+endfunc
+
 func SetChangeMarks(start, end)
   exe a:start. 'mark ['
   exe a:end. 'mark ]'
diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
@@ -1174,8 +1174,13 @@ func Test_out_cb()
     " Receive a json object split in pieces
     let g:Ch_outobj = ''
     call ch_sendraw(job, "echosplit [0, {\"one\": 1,| \"tw|o\": 2, \"three\": 3|}]\n")
-    " For unknown reason this can be very slow on Mac.
-    call WaitForAssert({-> assert_equal({'one': 1, 'two': 2, 'three': 3}, g:Ch_outobj)}, 10000)
+    " For unknown reasons this can be very slow on Mac.
+    if has('mac')
+      let timeout = 20000
+    else
+      let timeout = 5000
+    endif
+    call WaitForAssert({-> assert_equal({'one': 1, 'two': 2, 'three': 3}, g:Ch_outobj)}, timeout)
   finally
     call job_stop(job)
   endtry
diff --git a/src/testdir/test_menu.vim b/src/testdir/test_menu.vim
@@ -41,18 +41,25 @@ func Test_buffer_menu_special_buffers()
 
   let orig_buffer_menus = execute("nmenu Buffers")
 
+  " Test that regular new buffer results in a new buffer menu item.
+  new
+  let new_buffer_menus = execute('nmenu Buffers')
+  call assert_equal(len(split(orig_buffer_menus, "\n")) + 2, len(split(new_buffer_menus, "\n")))
+  bwipe!
+  call assert_equal(orig_buffer_menus, execute("nmenu Buffers"))
+
   " Make a new command-line window, test that it does not create a new buffer
   " menu.
   call feedkeys("q::let cmdline_buffer_menus=execute('nmenu Buffers')\<CR>:q\<CR>", 'ntx')
-  call assert_equal(len(split(orig_buffer_menus, "\n")), len(split(cmdline_buffer_menus, "\n")))
+  call assert_equal(len(split(orig_buffer_menus, "\n")) + 2, len(split(cmdline_buffer_menus, "\n")))
   call assert_equal(orig_buffer_menus, execute("nmenu Buffers"))
 
   if has('terminal')
     " Open a terminal window and test that it does not create a buffer menu
     " item.
     terminal
     let term_buffer_menus = execute('nmenu Buffers')
-    call assert_equal(len(split(orig_buffer_menus, "\n")), len(split(term_buffer_menus, "\n")))
+    call assert_equal(len(split(orig_buffer_menus, "\n")) + 2, len(split(term_buffer_menus, "\n")))
     bwipe!
     call assert_equal(orig_buffer_menus, execute("nmenu Buffers"))
   endif
@@ -163,6 +170,9 @@ endfunc
 
 " Test for menu item completion in command line
 func Test_menu_expand()
+  " Make sure we don't have stale menu items like Buffers menu.
+  source $VIMRUNTIME/delmenu.vim
+
   " Create the menu itmes for test
   menu Dummy.Nothing lll
   for i in range(1, 4)
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
@@ -2541,17 +2541,19 @@ func Test_term_nasty_callback()
     let g:buf1 = term_start('sh', #{hidden: 1, term_finish: 'close'})
     call popup_create(g:buf1, {})
     let g:buf2 = term_start(['sh', '-c'], #{curwin: 1, exit_cb: function('TermExit')})
-    sleep 100m
+    call term_wait(g:buf2, 100)
     call popup_close(win_getid())
   endfunc
   func TermExit(...)
-    call term_sendkeys(bufnr('#'), "exit\<CR>")
+    let altbuf = bufnr('#')
+    call term_sendkeys(altbuf, "exit\<CR>")
+    call term_wait(altbuf)
     call popup_close(win_getid())
   endfunc
   call OpenTerms()
 
   call term_sendkeys(g:buf0, "exit\<CR>")
-  sleep 100m
+  call term_wait(g:buf0, 100)
   exe g:buf0 .. 'bwipe!'
   set hidden&
 endfunc
diff --git a/src/testdir/test_vim9_expr.vim b/src/testdir/test_vim9_expr.vim
diff --git a/src/version.c b/src/version.c
diff --git a/src/vim9compile.c b/src/vim9compile.c
diff --git a/src/vim9execute.c b/src/vim9execute.c

Original file line number	Diff line number	Diff line change
`@@ -3463,7 +3463,6 @@ f_getwinvar(typval_T argvars, typval_T rettv)`
`3463`	`3463`	`f_getbufvar(typval_T argvars, typval_T rettv)`
`3464`	`3464`	`{`
`3465`	`3465`	`buf_T *buf;`
`3466`		`- buf_T *save_curbuf;`
`3467`	`3466`	`char_u *varname;`
`3468`	`3467`	`dictitem_T *v;`
`3469`	`3468`	`int done = FALSE;`
`@@ -3478,12 +3477,13 @@ f_getbufvar(typval_T argvars, typval_T rettv)`
`3478`	`3477`
`3479`	`3478`	`if (buf != NULL && varname != NULL)`
`3480`	`3479`	`{`
`3481`		`- // set curbuf to be our buf, temporarily`
`3482`		`- save_curbuf = curbuf;`
`3483`		`- curbuf = buf;`
`3484`		`-`
`3485`	`3480`	`if (*varname == '&')`
`3486`	`3481`	`{`
	`3482`	`+ buf_T *save_curbuf = curbuf;`
	`3483`	`+`
	`3484`	`+ // set curbuf to be our buf, temporarily`
	`3485`	`+ curbuf = buf;`
	`3486`	`+`
`3487`	`3487`	`if (varname[1] == NUL)`
`3488`	`3488`	`{`
`3489`	`3489`	`// get all buffer-local options in a dict`
`@@ -3498,22 +3498,21 @@ f_getbufvar(typval_T argvars, typval_T rettv)`
`3498`	`3498`	`else if (get_option_tv(&varname, rettv, TRUE) == OK)`
`3499`	`3499`	`// buffer-local-option`
`3500`	`3500`	`done = TRUE;`
	`3501`	`+`
	`3502`	`+ // restore previous notion of curbuf`
	`3503`	`+ curbuf = save_curbuf;`
`3501`	`3504`	`}`
`3502`	`3505`	`else`
`3503`	`3506`	`{`
`3504`	`3507`	`// Look up the variable.`
`3505`	`3508`	`// Let getbufvar({nr}, "") return the "b:" dictionary.`
`3506`		`- v = find_var_in_ht(&curbuf->b_vars->dv_hashtab,`
`3507`		`- 'b', varname, FALSE);`
	`3509`	`+ v = find_var_in_ht(&buf->b_vars->dv_hashtab, 'b', varname, FALSE);`
`3508`	`3510`	`if (v != NULL)`
`3509`	`3511`	`{`
`3510`	`3512`	`copy_tv(&v->di_tv, rettv);`
`3511`	`3513`	`done = TRUE;`
`3512`	`3514`	`}`
`3513`	`3515`	`}`
`3514`		`-`
`3515`		`- // restore previous notion of curbuf`
`3516`		`- curbuf = save_curbuf;`
`3517`	`3516`	`}`
`3518`	`3517`
`3519`	`3518`	`if (!done && argvars[2].v_type != VAR_UNKNOWN)`
`@@ -3620,11 +3619,11 @@ f_setbufvar(typval_T argvars, typval_T rettv UNUSED)`
`3620`	`3619`	`}`
`3621`	`3620`	`else`
`3622`	`3621`	`{`
`3623`		`- buf_T *save_curbuf = curbuf;`
`3624`		`-`
`3625`	`3622`	`bufvarname = alloc(STRLEN(varname) + 3);`
`3626`	`3623`	`if (bufvarname != NULL)`
`3627`	`3624`	`{`
	`3625`	`+ buf_T *save_curbuf = curbuf;`
	`3626`	`+`
`3628`	`3627`	`curbuf = buf;`
`3629`	`3628`	`STRCPY(bufvarname, "b:");`
`3630`	`3629`	`STRCPY(bufvarname + 2, varname);`
Original file line number	Diff line number	Diff line change
`@@ -398,16 +398,6 @@ static const luaV_Reg luaV_dll[] = {`
`398`	`398`
`399`	`399`	`static HANDLE hinstLua = NULL;`
`400`	`400`
`401`		`- static void`
`402`		`-end_dynamic_lua(void)`
`403`		`-{`
`404`		`- if (hinstLua)`
`405`		`- {`
`406`		`- close_dll(hinstLua);`
`407`		`- hinstLua = 0;`
`408`		`- }`
`409`		`-}`
`410`		`-`
`411`	`401`	`static int`
`412`	`402`	`lua_link_init(char *libname, int verbose)`
`413`	`403`	`{`
`@@ -2121,9 +2111,6 @@ lua_end(void)`
`2121`	`2111`	`{`
`2122`	`2112`	`lua_close(L);`
`2123`	`2113`	`L = NULL;`
`2124`		`-#ifdef DYNAMIC_LUA`
`2125`		`- end_dynamic_lua();`
`2126`		`-#endif`
`2127`	`2114`	`}`
`2128`	`2115`	`}`
`2129`	`2116`
Original file line number	Diff line number	Diff line change
`@@ -280,13 +280,6 @@ tcl_enabled(int verbose)`
`280`	`280`	`void`
`281`	`281`	`tcl_end(void)`
`282`	`282`	`{`
`283`		`-#ifdef DYNAMIC_TCL`
`284`		`- if (hTclLib)`
`285`		`- {`
`286`		`- close_dll(hTclLib);`
`287`		`- hTclLib = NULL;`
`288`		`- }`
`289`		`-#endif`
`290`	`283`	`}`
`291`	`284`
`292`	`285`	`/////////////////////////////////////////////////////////////////////////////`