diff options
| author | Valerio Virgillito | 2012-07-17 11:29:09 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-07-17 11:29:09 -0700 |
| commit | 58e86247524cc2d545bd6884f1b5c9fdba3b9164 (patch) | |
| tree | 53305d354fce502ee39378babf47ace6c91ce2fd /imports/codemirror/mode/php/php.js | |
| parent | 0f0cffd4df85e7adf5081fe66c768c70b2ead9b3 (diff) | |
| parent | 4f737b24c19ddc02d20f9783b8b080fc6ef11142 (diff) | |
| download | ninja-58e86247524cc2d545bd6884f1b5c9fdba3b9164.tar.gz | |
Merge branch 'refs/heads/master' into v0.7.1
Diffstat (limited to 'imports/codemirror/mode/php/php.js')
| -rw-r--r-- | imports/codemirror/mode/php/php.js | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ | |||
| 143 | 143 | ||
| 144 | electricChars: "/{}:" | 144 | electricChars: "/{}:" |
| 145 | } | 145 | } |
| 146 | }); | 146 | }, "xml", "clike", "javascript", "css"); |
| 147 | CodeMirror.defineMIME("application/x-httpd-php", "php"); | 147 | CodeMirror.defineMIME("application/x-httpd-php", "php"); |
| 148 | CodeMirror.defineMIME("application/x-httpd-php-open", {name: "php", startOpen: true}); | 148 | CodeMirror.defineMIME("application/x-httpd-php-open", {name: "php", startOpen: true}); |
| 149 | CodeMirror.defineMIME("text/x-php", phpConfig); | 149 | CodeMirror.defineMIME("text/x-php", phpConfig); |