Changeset 113

Timestamp:

08/24/08 20:06:01 (3 months ago)

Author:

verbosus

Message:

Added Michael Demmer patch to django-mode.el

Files:

• hacks/trunk/django-mode.el (modified) (3 diffs)

hacks/trunk/django-mode.el

@@ -10 +10 @@
 ;     for the font-locking patch for HTML syntax
 ;
+;   - Alessandro Guido
+;     for the sgml-mode include patch
+; 
+;   - Michael Demmer
+;     for the regexp order issue 
+
+(require 'sgml-mode)
 
 (defvar django-mode-hook nil)
@@ -24 +31 @@
   (list
    '("{% ?comment ?%}\\(\n?.*?\\)+?{% ?endcomment ?%}" . font-lock-comment-face)
-   '("{% ?\\(\\(end\\)?\\(extends\\|for\\|cycle\\|filter\\|firstof\\|debug\\|if\\|ifchanged\\|ifequal\\|ifnotequal\\|include\\|load\\|now\\|regroup\\|spaceless\\|ssi\\|templatetag\\|widthratio\\|block\\)\\) ?.*? ?%}" . 1)
+   '("{% ?\\(\\(end\\)?\\(extends\\|for\\|cycle\\|filter\\|firstof\\|debug\\|if\\(changed\\|equal\\|notequal\\|\\)\\|include\\|load\\|now\\|regroup\\|spaceless\\|ssi\\|templatetag\\|widthratio\\|block\\)\\) ?.*? ?%}" . 1)
    '("{{ ?\\(.*?\\) ?}}" . (1 font-lock-variable-name-face))
    '("{%\\|\\%}\\|{{\\|}}" . font-lock-builtin-face)
@@ -30 +37 @@
 
 (defvar django-font-lock-keywords 
-  (append html-font-lock-keywords django-font-lock-keywords-1) 
+  (append sgml-font-lock-keywords django-font-lock-keywords-1) 
   "Default highlighting expressions for Django mode")