From 0e04fff0ea80fa5cbe96b8354db38bd334aea83a Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Mon, 16 Jul 2012 16:04:05 -0700
Subject: upgrade to codemirror 2.3

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

Conflicts:

	js/code-editor/codemirror-ninja/theme/lesser-dark-ninja.css

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 imports/codemirror/mode/php/php.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'imports/codemirror/mode/php/php.js')

diff --git a/imports/codemirror/mode/php/php.js b/imports/codemirror/mode/php/php.js
index 5406a5ce..e35922fd 100644
--- a/imports/codemirror/mode/php/php.js
+++ b/imports/codemirror/mode/php/php.js
@@ -143,7 +143,7 @@
 
       electricChars: "/{}:"
     }
-  });
+  }, "xml", "clike", "javascript", "css");
   CodeMirror.defineMIME("application/x-httpd-php", "php");
   CodeMirror.defineMIME("application/x-httpd-php-open", {name: "php", startOpen: true});
   CodeMirror.defineMIME("text/x-php", phpConfig);
-- 
cgit v1.2.3