2 files changed, 3 insertions, 1 deletions
diff --git a/public/vendor/codemirror/mode/velocity/index.html b/public/vendor/codemirror/mode/velocity/index.html
index 27478786..7eba8f41 100644
--- a/public/vendor/codemirror/mode/velocity/index.html
+++ b/public/vendor/codemirror/mode/velocity/index.html
@@ -77,6 +77,8 @@ $someObject.getValues("this is a string split
 
 $someObject("This plus $something in the middle").method(7567).property
 
+#set($something = "Parseable string with '$quotes'!")
+
 #macro( tablerows $color $somelist )
     #foreach( $something in $somelist )
         <tr><td bgcolor=$color>$something</td></tr>
diff --git a/public/vendor/codemirror/mode/velocity/velocity.js b/public/vendor/codemirror/mode/velocity/velocity.js
index 8fc4f95d..12ee2212 100644
--- a/public/vendor/codemirror/mode/velocity/velocity.js
+++ b/public/vendor/codemirror/mode/velocity/velocity.js
@@ -34,7 +34,7 @@ CodeMirror.defineMode("velocity", function() {
         state.beforeParams = false;
         var ch = stream.next();
         // start of unparsed string?
-        if ((ch == "'") && state.inParams) {
+        if ((ch == "'") && !state.inString && state.inParams) {
             state.lastTokenWasBuiltin = false;
             return chain(stream, state, tokenString(ch));
         }