X-Git-Url: http://gitweb.michael.orlitzky.com/?p=emacs.d.git;a=blobdiff_plain;f=auto-modes.el;h=def3c80cebeac1590c522e936e2765b2f04080fa;hp=063f43631ab631a6ec4d04b4fd07628eead8107c;hb=50d37f3f58177e2943b4e7492d4ff7084c12641f;hpb=61320544595e17db37c03c88951e6e5d82678310

diff --git a/auto-modes.el b/auto-modes.el
index 063f436..def3c80 100644
--- a/auto-modes.el
+++ b/auto-modes.el
@@ -1,22 +1,22 @@
 (setq auto-mode-alist
       (append
        (list
-	
+
 	;; apache-mode
-	'("\\.htaccess$"   . apache-mode)
-	'("httpd\\.conf$"  . apache-mode)
-	'("srm\\.conf$"    . apache-mode)
-	'("access\\.conf$" . apache-mode)
-	'("apache[12]\?\\.conf$" . apache-mode)
+	'("\\.htaccess$"               . apache-mode)
+	'("httpd\\.conf$"              . apache-mode)
+	'("srm\\.conf$"                . apache-mode)
+	'("access\\.conf$"             . apache-mode)
+	'("apache[12]\?\\.conf$"       . apache-mode)
 	'("commonapache[12]\?\\.conf$" . apache-mode)
 
 	;; basic-mode
 	'("\\.class\\.asp$" . basic-mode)
-	'("\\.vbs$" . basic-mode)
-	
+	'("\\.vbs$"         . basic-mode)
+
 	;; csharp-mode
 	'("\\.ascx$" . csharp-mode)
-	'("\\.cs$" . csharp-mode)
+	'("\\.cs$"   . csharp-mode)
 
 	;; css-mode
 	'("\\.css$" . css-mode)
@@ -24,36 +24,41 @@
 	;; ebuild-mode
 	'("\\.ebuild$" . ebuild-mode)
 
-	;; ecmascript-mode
-	'("\\.js$" . ecmascript-mode)
+	;; js-mode
+	'("\\.js$" . js-mode)
 
 	;; haskell-mode
-	'("\\.hs$" . haskell-mode)
-	
+	'("\\.l?hs$" . haskell-mode)
+
+	;; octave-mode, the extension is a MATLAB relic.
+	'("\\.m$" . octave-mode)
+
 	;; nagios-mode
 	'("\\.cfg$" . nagios-mode)
 
 	;; nxml-mode
-	'("\\.asp$" . nxml-mode)
-	'("\\.aspx$" . nxml-mode)
-	'("\\.xml$" . nxml-mode)
-	'("\\.?html$" . nxml-mode)
+	'("\\.asp$"    . nxml-mode)
+	'("\\.aspx$"   . nxml-mode)
+	'("\\.xml$"    . nxml-mode)
+	'("\\.?html$"  . nxml-mode)
 	'("\\.config$" . nxml-mode)
-	'("\\.tpl$" . nxml-mode)
-	'("\\.rdf$" . nxml-mode)
-	'("\\.xul$" . nxml-mode)
-			       
+	'("\\.tpl$"    . nxml-mode) ;; Smarty templates
+	'("\\.rdf$"    . nxml-mode)
+	'("\\.xul$"    . nxml-mode)
+
 	;; php-mode
-	'("\\.php$" . php-mode)
-			       
+	'("\\.php$"    . php-mode)
+	'("\\.module$" . php-mode) ;; Drupal modules
+
 	;; python-mode
-	'("\\.py$" . python-mode)
+	'("\\.pyx?$" . python-mode)
 
 	;; ruby-mode
 	'("\\.rake$" . ruby-mode)
-	'("\\.rb$" . ruby-mode)
+	'("\\.rb$"   . ruby-mode)
 
+	;; Perhaps surprisingly, I do not use Emacs as my PDF viewer.
 	'("\\.pdf$" . fundamental-mode)
 	)
-			      
+
        auto-mode-alist))