From 94d2fc1815a919734353c942f224db1de4b4fcb8 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Mon, 7 Mar 2011 09:04:49 +0100
Subject: Django, org

  * Added nxhtml, mostly for django support.

  * Changed some org settings.
---
 emacs.d/10-file-associations.el | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'emacs.d/10-file-associations.el')

diff --git a/emacs.d/10-file-associations.el b/emacs.d/10-file-associations.el
index 00084f4..52a7e23 100644
--- a/emacs.d/10-file-associations.el
+++ b/emacs.d/10-file-associations.el
@@ -3,6 +3,8 @@
 (add-to-list 'auto-mode-alist '("\\.cs$" . csharp-mode))
 (add-to-list 'auto-mode-alist '("\\.bat$" . batch-mode))
 (add-to-list 'auto-mode-alist '("\\.lua$" . lua-mode))
+(add-to-list 'auto-mode-alist '("\\.php[345]?$" . php-mode))
+(add-to-list 'auto-mode-alist '("\\.js\\(on\\)?$" . javascript-mode))
 
 (add-to-list 'file-coding-system-alist '("\\.vala$" . utf-8))
 (add-to-list 'file-coding-system-alist '("\\.vapi$" . utf-8))
-- 
cgit v1.2.3-54-g00ecf