From ed3a10f0439ad826b1b46574057d09350123a1b5 Mon Sep 17 00:00:00 2001
From: Jeremy Ruston <jeremy@osmosoft.com>
Date: Fri, 31 Aug 2012 15:04:08 +0100
Subject: [PATCH] Renamed `tiddlywiki.plugin` files to `tiddlywiki.files`

Because we're just about to use the name `tiddlywiki.plugin` for
exploded plugin folders
---
 core/boot.js                                                | 6 +++---
 .../esprima/{tiddlywiki.plugin => tiddlywiki.files.plugin}  | 0
 core/styles/{tiddlywiki.plugin => tiddlywiki.files.plugin}  | 0
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename core/modules/parsers/javascriptparser/esprima/{tiddlywiki.plugin => tiddlywiki.files.plugin} (100%)
 rename core/styles/{tiddlywiki.plugin => tiddlywiki.files.plugin} (100%)

diff --git a/core/boot.js b/core/boot.js
index a7d918861..cb4077220 100644
--- a/core/boot.js
+++ b/core/boot.js
@@ -658,10 +658,10 @@ $tw.loadTiddlersFromFolder = function(filepath,basetitle,excludeRegExp,isShadow)
 		var stat = fs.statSync(filepath);
 		if(stat.isDirectory()) {
 			var files = fs.readdirSync(filepath);
-			// Look for a tiddlywiki.plugin file
-			if(files.indexOf("tiddlywiki.plugin") !== -1) {
+			// Look for a tiddlywiki.files file
+			if(files.indexOf("tiddlywiki.files") !== -1) {
 				// If so, process the files it describes
-				var pluginInfo = JSON.parse(fs.readFileSync(filepath + "/tiddlywiki.plugin").toString("utf8"));
+				var pluginInfo = JSON.parse(fs.readFileSync(filepath + "/tiddlywiki.files").toString("utf8"));
 				for(var p=0; p<pluginInfo.tiddlers.length; p++) {
 					var tidInfo = pluginInfo.tiddlers[p],
 						typeInfo = $tw.config.contentTypeInfo[tidInfo.fields.type || "text/plain"],
diff --git a/core/modules/parsers/javascriptparser/esprima/tiddlywiki.plugin b/core/modules/parsers/javascriptparser/esprima/tiddlywiki.files.plugin
similarity index 100%
rename from core/modules/parsers/javascriptparser/esprima/tiddlywiki.plugin
rename to core/modules/parsers/javascriptparser/esprima/tiddlywiki.files.plugin
diff --git a/core/styles/tiddlywiki.plugin b/core/styles/tiddlywiki.files.plugin
similarity index 100%
rename from core/styles/tiddlywiki.plugin
rename to core/styles/tiddlywiki.files.plugin