My earlier patch for lexing Django tags broke html lexing around {% %} tags. The attached file fixes this by removing incorrect code that had no real effect. In the future would be nice to fold {% if %} ... {% endif %} and similar but that requires actually storing what tag was seen and looking for the corresponding closing tag.
Based on CVS version 1.133
Committed.