Merge remote-tracking branch 'vim/master'

splhack · splhack · commit ea32277f0ed4 · 2018-06-26T21:34:02.000-07:00
diff --git a/src/dosinst.c b/src/dosinst.c
@@ -1878,7 +1878,7 @@ install_start_menu(int idx)
 	add_pathsep(shell_folder_path);
 	strcat(shell_folder_path, "Vim Online.url");
 	if (!WritePrivateProfileString("InternetShortcut", "URL",
-				     "http://vim.sf.net/", shell_folder_path))
+				    "https://www.vim.org/", shell_folder_path))
 	{
 	    printf("Creating the Vim online URL failed\n");
 	    return;
diff --git a/src/version.c b/src/version.c
@@ -804,6 +804,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    117,
 /**/
     116,
 /**/

Original file line number	Diff line number	Diff line change
`@@ -1878,7 +1878,7 @@ install_start_menu(int idx)`
`1878`	`1878`	`add_pathsep(shell_folder_path);`
`1879`	`1879`	`strcat(shell_folder_path, "Vim Online.url");`
`1880`	`1880`	`if (!WritePrivateProfileString("InternetShortcut", "URL",`
`1881`		`- "http://vim.sf.net/", shell_folder_path))`
	`1881`	`+ "https://www.vim.org/", shell_folder_path))`
`1882`	`1882`	`{`
`1883`	`1883`	`printf("Creating the Vim online URL failed\n");`
`1884`	`1884`	`return;`