Merge from vscode c873727e8bac95e7cbf5b154a9e6ae0986f2ce18 (#6446)

extensions/theme-seti/build/update-icon-theme.js

@@ -10,7 +10,7 @@ let fs = require('fs');
 let https = require('https');
 let url = require('url');
 
-// list of languagesIs not shipped with VSCode. The information is used to associate an icon with a langauge association
+// list of languagesIs not shipped with VSCode. The information is used to associate an icon with a language association
 let nonBuiltInLanguages = { // { fileNames, extensions }
 	"r": { extensions: ['r', 'rhistory', 'rprofile', 'rt'] },
 	"argdown": { extensions: ['ad', 'adown', 'argdown', 'argdn'] },
@@ -35,7 +35,7 @@ let nonBuiltInLanguages = { // { fileNames, extensions }
 	"todo": { fileNames: ['todo'] }
 };
 
-let FROM_DISK = false; // set to true to take content from a repo checkedout next to the vscode repo
+let FROM_DISK = true; // set to true to take content from a repo checked out next to the vscode repo
 
 let font, fontMappingsFile, fileAssociationFile, colorsFile;
 if (!FROM_DISK) {

extensions/theme-seti/cgmanifest.json

@@ -6,7 +6,7 @@
 				"git": {
 					"name": "seti-ui",
 					"repositoryUrl": "https://github.com/jesseweed/seti-ui",
-					"commitHash": "89175d7f9e0c70cd325b80a18a3c77fc8eb7c798"
+					"commitHash": "904c16acced1134a81b31d71d60293288c31334b"
 				}
 			},
 			"version": "0.1.0"