X-Git-Url: http://gitweb.michael.orlitzky.com/?p=emacs.d.git;a=blobdiff_plain;f=auto-modes.el;h=a616d48447672357b1e3119486dd45c383b174f9;hp=7f42af0194392917cc0e6cbc63ef9327e8f061a3;hb=HEAD;hpb=7e726d2f4c8ac4dc27a90a4c1e86409846c1dea9

diff --git a/auto-modes.el b/auto-modes.el
index 7f42af0..a616d48 100644
--- a/auto-modes.el
+++ b/auto-modes.el
@@ -10,26 +10,12 @@
 	'("apache[12]\?\\.conf$"       . apache-mode)
 	'("commonapache[12]\?\\.conf$" . apache-mode)
 
-	;; basic-mode
-	'("\\.class\\.asp$" . basic-mode)
-	'("\\.vbs$"         . basic-mode)
-
-	;; csharp-mode
-	'("\\.ascx$" . csharp-mode)
-	'("\\.cs$"   . csharp-mode)
-
-	;; css-mode
-	'("\\.css$" . css-mode)
-
-	;; ebuild-mode
-	'("\\.ebuild$" . ebuild-mode)
-
-	;; js-mode
-	'("\\.js$" . js-mode)
-
 	;; haskell-mode
 	'("\\.l?hs$" . haskell-mode)
 
+	;; octave-mode, the extension is a MATLAB relic.
+	'("\\.m$" . octave-mode)
+
 	;; nagios-mode
 	'("\\.cfg$" . nagios-mode)
 
@@ -44,15 +30,14 @@
 	'("\\.xul$"    . nxml-mode)
 
 	;; php-mode
-	'("\\.php$"    . php-mode)
 	'("\\.module$" . php-mode) ;; Drupal modules
 
 	;; python-mode
 	'("\\.pyx?$" . python-mode)
 
 	;; ruby-mode
-	'("\\.rake$" . ruby-mode)
-	'("\\.rb$"   . ruby-mode)
+	'("\\.rake$"      . ruby-mode)
+	'("/[Rr]akefile$" . ruby-mode)
 
 	;; Perhaps surprisingly, I do not use Emacs as my PDF viewer.
 	'("\\.pdf$" . fundamental-mode)