Merge remote-tracking branch 'upstream/master' into tabsidebar

rbtnn · Sep 21, 2024 · 17c4c63 · 17c4c63
2 parents ea3c48d + a6de287
commit 17c4c63
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
@@ -243,7 +243,7 @@ if has("fname_case")
 endif
 au BufNewFile,BufRead *.sysx			setf rapid
 if has("fname_case")
-  au BufNewFile,BufRead *.sysX,*.Sysx,*.SysX,*.SYSX	setf rapid
+  au BufNewFile,BufRead *.sysX,*.Sysx,*.SysX,*.SYSX,*.SYSx	setf rapid
 endif
 
 " Batch file for 4DOS
@@ -1506,7 +1506,7 @@ if has("fname_case")
 endif
 au BufNewFile,BufRead *.modx			setf rapid
 if has("fname_case")
-   au BufNewFile,BufRead *.modX,*.Modx,*.ModX,*.MODX	setf rapid
+   au BufNewFile,BufRead *.modX,*.Modx,*.ModX,*.MODX,*.MODx	setf rapid
 endif
 
 " Modula-3 (.m3, .i3, .mg, .ig)

diff --git a/src/ex_getln.c b/src/ex_getln.c
@@ -3330,7 +3330,6 @@ realloc_cmdbuff(int len)
     // there, thus copy up to the NUL and add a NUL.
     mch_memmove(ccline.cmdbuff, p, (size_t)ccline.cmdlen);
     ccline.cmdbuff[ccline.cmdlen] = NUL;
-    vim_free(p);
 
     if (ccline.xpc != NULL
 	    && ccline.xpc->xp_pattern != NULL
@@ -3345,6 +3344,8 @@ realloc_cmdbuff(int len)
 	    ccline.xpc->xp_pattern = ccline.cmdbuff + i;
     }
 
+    vim_free(p);
+
     return OK;
 }
 

diff --git a/src/version.c b/src/version.c
@@ -709,6 +709,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    739,
 /**/
     738,
 /**/
-Original file line number
+Diff line change
@@ Expand Up / @@ -709,6 +709,8 @@ static char *(features[]) = @@
     static int included_patches[] =
     {   /* Add new patch number below this line */
+    /**/
+,
     /**/
 ,
     /**/
@@ Expand Down @@