Django, org

  * Added nxhtml, mostly for django support.

  * Changed some org settings.

1 files changed, 37 insertions, 0 deletions

diff --git a/emacs.d/nxhtml/tests/in/bug569742-master-end.html b/emacs.d/nxhtml/tests/in/bug569742-master-end.html
new file mode 100644
index 0000000..8e0419c
--- /dev/null
+++ b/emacs.d/nxhtml/tests/in/bug569742-master-end.html
@@ -0,0 +1,37 @@
+
+From EmacsWiki:
+
+I have chunk problems with 1.99. This works, it detects the PHP and JS chunks properly:
+
+<?
+
+
+$stuff = <<<EOTHTML
+
+    <script type="text/javascript">
+
+    //<![CDATA[
+
+    var stuff;
+
+    //]]>
+    </script>
+
+EOTHTML;
+
+
+However if I don’t close the inner chunk before EOTHTML, because I want to add some conditional code after it in PHP then it thinks the part of the buffer after EOTHTML is still in JS mode which is not good:
+
+<?
+
+
+$stuff = <<<EOTHTML
+
+    <script type="text/javascript">
+
+    //<![CDATA[
+
+    var stuff;
+
+EOTHTML;
+