From 12e6bedf6db96246f5bf6ec4c7d010512b93bc53 Mon Sep 17 00:00:00 2001
From: Matt Pass <matt@mattpass.com>
Date: Sat, 25 Apr 2015 15:12:47 +0100
Subject: [PATCH] CodeMirror dir renamed to just that

Dropped version number so we can see cleaner commit changes in future
---
 {CodeMirror-4.7 => CodeMirror}/LICENSE                        | 0
 {CodeMirror-4.7 => CodeMirror}/addon/hint/show-hint.css       | 0
 {CodeMirror-4.7 => CodeMirror}/addon/lint/lint.css            | 4 ++--
 {CodeMirror-4.7 => CodeMirror}/lib/codemirror-compressed.js   | 0
 {CodeMirror-4.7 => CodeMirror}/lib/codemirror.css             | 0
 {CodeMirror-4.7 => CodeMirror}/theme/3024-day.css             | 0
 {CodeMirror-4.7 => CodeMirror}/theme/3024-night.css           | 0
 {CodeMirror-4.7 => CodeMirror}/theme/ambiance.css             | 0
 {CodeMirror-4.7 => CodeMirror}/theme/base16-dark.css          | 0
 {CodeMirror-4.7 => CodeMirror}/theme/base16-light.css         | 0
 {CodeMirror-4.7 => CodeMirror}/theme/blackboard.css           | 0
 {CodeMirror-4.7 => CodeMirror}/theme/cobalt.css               | 0
 {CodeMirror-4.7 => CodeMirror}/theme/colorforth.css           | 0
 {CodeMirror-4.7 => CodeMirror}/theme/eclipse.css              | 0
 {CodeMirror-4.7 => CodeMirror}/theme/elegant.css              | 0
 {CodeMirror-4.7 => CodeMirror}/theme/erlang-dark.css          | 0
 {CodeMirror-4.7 => CodeMirror}/theme/icecoder-classic.css     | 0
 {CodeMirror-4.7 => CodeMirror}/theme/lesser-dark.css          | 0
 {CodeMirror-4.7 => CodeMirror}/theme/liquibyte.css            | 0
 {CodeMirror-4.7 => CodeMirror}/theme/mbo.css                  | 0
 {CodeMirror-4.7 => CodeMirror}/theme/mdn-like.css             | 0
 {CodeMirror-4.7 => CodeMirror}/theme/midnight.css             | 0
 {CodeMirror-4.7 => CodeMirror}/theme/monokai.css              | 0
 {CodeMirror-4.7 => CodeMirror}/theme/neat.css                 | 0
 {CodeMirror-4.7 => CodeMirror}/theme/neo.css                  | 0
 {CodeMirror-4.7 => CodeMirror}/theme/night.css                | 0
 {CodeMirror-4.7 => CodeMirror}/theme/paraiso-dark.css         | 0
 {CodeMirror-4.7 => CodeMirror}/theme/paraiso-light.css        | 0
 {CodeMirror-4.7 => CodeMirror}/theme/pastel-on-dark.css       | 0
 {CodeMirror-4.7 => CodeMirror}/theme/rubyblue.css             | 0
 {CodeMirror-4.7 => CodeMirror}/theme/solarized.css            | 0
 {CodeMirror-4.7 => CodeMirror}/theme/the-matrix.css           | 0
 .../theme/tomorrow-night-bright.css                           | 0
 .../theme/tomorrow-night-eighties.css                         | 0
 {CodeMirror-4.7 => CodeMirror}/theme/twilight.css             | 0
 {CodeMirror-4.7 => CodeMirror}/theme/vibrant-ink.css          | 0
 {CodeMirror-4.7 => CodeMirror}/theme/xq-dark.css              | 0
 {CodeMirror-4.7 => CodeMirror}/theme/xq-light.css             | 0
 {CodeMirror-4.7 => CodeMirror}/theme/zenburn.css              | 0
 lib/settings.php                                              | 2 +-
 40 files changed, 3 insertions(+), 3 deletions(-)
 rename {CodeMirror-4.7 => CodeMirror}/LICENSE (100%)
 rename {CodeMirror-4.7 => CodeMirror}/addon/hint/show-hint.css (100%)
 rename {CodeMirror-4.7 => CodeMirror}/addon/lint/lint.css (98%)
 rename {CodeMirror-4.7 => CodeMirror}/lib/codemirror-compressed.js (100%)
 rename {CodeMirror-4.7 => CodeMirror}/lib/codemirror.css (100%)
 rename {CodeMirror-4.7 => CodeMirror}/theme/3024-day.css (100%)
 rename {CodeMirror-4.7 => CodeMirror}/theme/3024-night.css (100%)
 rename {CodeMirror-4.7 => CodeMirror}/theme/ambiance.css (100%)
 rename {CodeMirror-4.7 => CodeMirror}/theme/base16-dark.css (100%)
 rename {CodeMirror-4.7 => CodeMirror}/theme/base16-light.css (100%)
 rename {CodeMirror-4.7 => CodeMirror}/theme/blackboard.css (100%)
 rename {CodeMirror-4.7 => CodeMirror}/theme/cobalt.css (100%)
 rename {CodeMirror-4.7 => CodeMirror}/theme/colorforth.css (100%)
 rename {CodeMirror-4.7 => CodeMirror}/theme/eclipse.css (100%)
 rename {CodeMirror-4.7 => CodeMirror}/theme/elegant.css (100%)
 rename {CodeMirror-4.7 => CodeMirror}/theme/erlang-dark.css (100%)
 rename {CodeMirror-4.7 => CodeMirror}/theme/icecoder-classic.css (100%)
 rename {CodeMirror-4.7 => CodeMirror}/theme/lesser-dark.css (100%)
 rename {CodeMirror-4.7 => CodeMirror}/theme/liquibyte.css (100%)
 rename {CodeMirror-4.7 => CodeMirror}/theme/mbo.css (100%)
 rename {CodeMirror-4.7 => CodeMirror}/theme/mdn-like.css (100%)
 rename {CodeMirror-4.7 => CodeMirror}/theme/midnight.css (100%)
 rename {CodeMirror-4.7 => CodeMirror}/theme/monokai.css (100%)
 rename {CodeMirror-4.7 => CodeMirror}/theme/neat.css (100%)
 rename {CodeMirror-4.7 => CodeMirror}/theme/neo.css (100%)
 rename {CodeMirror-4.7 => CodeMirror}/theme/night.css (100%)
 rename {CodeMirror-4.7 => CodeMirror}/theme/paraiso-dark.css (100%)
 rename {CodeMirror-4.7 => CodeMirror}/theme/paraiso-light.css (100%)
 rename {CodeMirror-4.7 => CodeMirror}/theme/pastel-on-dark.css (100%)
 rename {CodeMirror-4.7 => CodeMirror}/theme/rubyblue.css (100%)
 rename {CodeMirror-4.7 => CodeMirror}/theme/solarized.css (100%)
 rename {CodeMirror-4.7 => CodeMirror}/theme/the-matrix.css (100%)
 rename {CodeMirror-4.7 => CodeMirror}/theme/tomorrow-night-bright.css (100%)
 rename {CodeMirror-4.7 => CodeMirror}/theme/tomorrow-night-eighties.css (100%)
 rename {CodeMirror-4.7 => CodeMirror}/theme/twilight.css (100%)
 rename {CodeMirror-4.7 => CodeMirror}/theme/vibrant-ink.css (100%)
 rename {CodeMirror-4.7 => CodeMirror}/theme/xq-dark.css (100%)
 rename {CodeMirror-4.7 => CodeMirror}/theme/xq-light.css (100%)
 rename {CodeMirror-4.7 => CodeMirror}/theme/zenburn.css (100%)

diff --git a/CodeMirror-4.7/LICENSE b/CodeMirror/LICENSE
similarity index 100%
rename from CodeMirror-4.7/LICENSE
rename to CodeMirror/LICENSE
diff --git a/CodeMirror-4.7/addon/hint/show-hint.css b/CodeMirror/addon/hint/show-hint.css
similarity index 100%
rename from CodeMirror-4.7/addon/hint/show-hint.css
rename to CodeMirror/addon/hint/show-hint.css
diff --git a/CodeMirror-4.7/addon/lint/lint.css b/CodeMirror/addon/lint/lint.css
similarity index 98%
rename from CodeMirror-4.7/addon/lint/lint.css
rename to CodeMirror/addon/lint/lint.css
index b6b42c2..414a9a0 100644
--- a/CodeMirror-4.7/addon/lint/lint.css
+++ b/CodeMirror/addon/lint/lint.css
@@ -1,6 +1,6 @@
 /* The lint marker gutter */
 .CodeMirror-lint-markers {
-  width: 12px; margin-left: 2px;
+  width: 16px;
 }
 
 .CodeMirror-lint-tooltip {
@@ -43,7 +43,7 @@
 .CodeMirror-lint-marker-error, .CodeMirror-lint-marker-warning {
   background-position: center center;
   background-repeat: no-repeat;
-  cursor: help;
+  cursor: pointer;
   display: inline-block;
   height: 16px;
   width: 16px;
diff --git a/CodeMirror-4.7/lib/codemirror-compressed.js b/CodeMirror/lib/codemirror-compressed.js
similarity index 100%
rename from CodeMirror-4.7/lib/codemirror-compressed.js
rename to CodeMirror/lib/codemirror-compressed.js
diff --git a/CodeMirror-4.7/lib/codemirror.css b/CodeMirror/lib/codemirror.css
similarity index 100%
rename from CodeMirror-4.7/lib/codemirror.css
rename to CodeMirror/lib/codemirror.css
diff --git a/CodeMirror-4.7/theme/3024-day.css b/CodeMirror/theme/3024-day.css
similarity index 100%
rename from CodeMirror-4.7/theme/3024-day.css
rename to CodeMirror/theme/3024-day.css
diff --git a/CodeMirror-4.7/theme/3024-night.css b/CodeMirror/theme/3024-night.css
similarity index 100%
rename from CodeMirror-4.7/theme/3024-night.css
rename to CodeMirror/theme/3024-night.css
diff --git a/CodeMirror-4.7/theme/ambiance.css b/CodeMirror/theme/ambiance.css
similarity index 100%
rename from CodeMirror-4.7/theme/ambiance.css
rename to CodeMirror/theme/ambiance.css
diff --git a/CodeMirror-4.7/theme/base16-dark.css b/CodeMirror/theme/base16-dark.css
similarity index 100%
rename from CodeMirror-4.7/theme/base16-dark.css
rename to CodeMirror/theme/base16-dark.css
diff --git a/CodeMirror-4.7/theme/base16-light.css b/CodeMirror/theme/base16-light.css
similarity index 100%
rename from CodeMirror-4.7/theme/base16-light.css
rename to CodeMirror/theme/base16-light.css
diff --git a/CodeMirror-4.7/theme/blackboard.css b/CodeMirror/theme/blackboard.css
similarity index 100%
rename from CodeMirror-4.7/theme/blackboard.css
rename to CodeMirror/theme/blackboard.css
diff --git a/CodeMirror-4.7/theme/cobalt.css b/CodeMirror/theme/cobalt.css
similarity index 100%
rename from CodeMirror-4.7/theme/cobalt.css
rename to CodeMirror/theme/cobalt.css
diff --git a/CodeMirror-4.7/theme/colorforth.css b/CodeMirror/theme/colorforth.css
similarity index 100%
rename from CodeMirror-4.7/theme/colorforth.css
rename to CodeMirror/theme/colorforth.css
diff --git a/CodeMirror-4.7/theme/eclipse.css b/CodeMirror/theme/eclipse.css
similarity index 100%
rename from CodeMirror-4.7/theme/eclipse.css
rename to CodeMirror/theme/eclipse.css
diff --git a/CodeMirror-4.7/theme/elegant.css b/CodeMirror/theme/elegant.css
similarity index 100%
rename from CodeMirror-4.7/theme/elegant.css
rename to CodeMirror/theme/elegant.css
diff --git a/CodeMirror-4.7/theme/erlang-dark.css b/CodeMirror/theme/erlang-dark.css
similarity index 100%
rename from CodeMirror-4.7/theme/erlang-dark.css
rename to CodeMirror/theme/erlang-dark.css
diff --git a/CodeMirror-4.7/theme/icecoder-classic.css b/CodeMirror/theme/icecoder-classic.css
similarity index 100%
rename from CodeMirror-4.7/theme/icecoder-classic.css
rename to CodeMirror/theme/icecoder-classic.css
diff --git a/CodeMirror-4.7/theme/lesser-dark.css b/CodeMirror/theme/lesser-dark.css
similarity index 100%
rename from CodeMirror-4.7/theme/lesser-dark.css
rename to CodeMirror/theme/lesser-dark.css
diff --git a/CodeMirror-4.7/theme/liquibyte.css b/CodeMirror/theme/liquibyte.css
similarity index 100%
rename from CodeMirror-4.7/theme/liquibyte.css
rename to CodeMirror/theme/liquibyte.css
diff --git a/CodeMirror-4.7/theme/mbo.css b/CodeMirror/theme/mbo.css
similarity index 100%
rename from CodeMirror-4.7/theme/mbo.css
rename to CodeMirror/theme/mbo.css
diff --git a/CodeMirror-4.7/theme/mdn-like.css b/CodeMirror/theme/mdn-like.css
similarity index 100%
rename from CodeMirror-4.7/theme/mdn-like.css
rename to CodeMirror/theme/mdn-like.css
diff --git a/CodeMirror-4.7/theme/midnight.css b/CodeMirror/theme/midnight.css
similarity index 100%
rename from CodeMirror-4.7/theme/midnight.css
rename to CodeMirror/theme/midnight.css
diff --git a/CodeMirror-4.7/theme/monokai.css b/CodeMirror/theme/monokai.css
similarity index 100%
rename from CodeMirror-4.7/theme/monokai.css
rename to CodeMirror/theme/monokai.css
diff --git a/CodeMirror-4.7/theme/neat.css b/CodeMirror/theme/neat.css
similarity index 100%
rename from CodeMirror-4.7/theme/neat.css
rename to CodeMirror/theme/neat.css
diff --git a/CodeMirror-4.7/theme/neo.css b/CodeMirror/theme/neo.css
similarity index 100%
rename from CodeMirror-4.7/theme/neo.css
rename to CodeMirror/theme/neo.css
diff --git a/CodeMirror-4.7/theme/night.css b/CodeMirror/theme/night.css
similarity index 100%
rename from CodeMirror-4.7/theme/night.css
rename to CodeMirror/theme/night.css
diff --git a/CodeMirror-4.7/theme/paraiso-dark.css b/CodeMirror/theme/paraiso-dark.css
similarity index 100%
rename from CodeMirror-4.7/theme/paraiso-dark.css
rename to CodeMirror/theme/paraiso-dark.css
diff --git a/CodeMirror-4.7/theme/paraiso-light.css b/CodeMirror/theme/paraiso-light.css
similarity index 100%
rename from CodeMirror-4.7/theme/paraiso-light.css
rename to CodeMirror/theme/paraiso-light.css
diff --git a/CodeMirror-4.7/theme/pastel-on-dark.css b/CodeMirror/theme/pastel-on-dark.css
similarity index 100%
rename from CodeMirror-4.7/theme/pastel-on-dark.css
rename to CodeMirror/theme/pastel-on-dark.css
diff --git a/CodeMirror-4.7/theme/rubyblue.css b/CodeMirror/theme/rubyblue.css
similarity index 100%
rename from CodeMirror-4.7/theme/rubyblue.css
rename to CodeMirror/theme/rubyblue.css
diff --git a/CodeMirror-4.7/theme/solarized.css b/CodeMirror/theme/solarized.css
similarity index 100%
rename from CodeMirror-4.7/theme/solarized.css
rename to CodeMirror/theme/solarized.css
diff --git a/CodeMirror-4.7/theme/the-matrix.css b/CodeMirror/theme/the-matrix.css
similarity index 100%
rename from CodeMirror-4.7/theme/the-matrix.css
rename to CodeMirror/theme/the-matrix.css
diff --git a/CodeMirror-4.7/theme/tomorrow-night-bright.css b/CodeMirror/theme/tomorrow-night-bright.css
similarity index 100%
rename from CodeMirror-4.7/theme/tomorrow-night-bright.css
rename to CodeMirror/theme/tomorrow-night-bright.css
diff --git a/CodeMirror-4.7/theme/tomorrow-night-eighties.css b/CodeMirror/theme/tomorrow-night-eighties.css
similarity index 100%
rename from CodeMirror-4.7/theme/tomorrow-night-eighties.css
rename to CodeMirror/theme/tomorrow-night-eighties.css
diff --git a/CodeMirror-4.7/theme/twilight.css b/CodeMirror/theme/twilight.css
similarity index 100%
rename from CodeMirror-4.7/theme/twilight.css
rename to CodeMirror/theme/twilight.css
diff --git a/CodeMirror-4.7/theme/vibrant-ink.css b/CodeMirror/theme/vibrant-ink.css
similarity index 100%
rename from CodeMirror-4.7/theme/vibrant-ink.css
rename to CodeMirror/theme/vibrant-ink.css
diff --git a/CodeMirror-4.7/theme/xq-dark.css b/CodeMirror/theme/xq-dark.css
similarity index 100%
rename from CodeMirror-4.7/theme/xq-dark.css
rename to CodeMirror/theme/xq-dark.css
diff --git a/CodeMirror-4.7/theme/xq-light.css b/CodeMirror/theme/xq-light.css
similarity index 100%
rename from CodeMirror-4.7/theme/xq-light.css
rename to CodeMirror/theme/xq-light.css
diff --git a/CodeMirror-4.7/theme/zenburn.css b/CodeMirror/theme/zenburn.css
similarity index 100%
rename from CodeMirror-4.7/theme/zenburn.css
rename to CodeMirror/theme/zenburn.css
diff --git a/lib/settings.php b/lib/settings.php
index 2786114..6657549 100644
--- a/lib/settings.php
+++ b/lib/settings.php
@@ -10,7 +10,7 @@ $newConfigSettingsFile = '<?php
 // ICEcoder system settings
 $ICEcoderSettings = array(
 	"versionNo"		=> "5.0 beta",
-	"codeMirrorDir"		=> "CodeMirror-4.7",
+	"codeMirrorDir"		=> "CodeMirror",
 	"docRoot"		=> $_SERVER[\'DOCUMENT_ROOT\'],
 	"demoMode"		=> false,
 	"devMode"		=> false,