Switch from ecmascript-mode to js-mode, which is built in to Emacs 23.2.

[emacs.d.git] / auto-modes.el

diff --git a/auto-modes.el b/auto-modes.el
index 21149accf13e3ff2059fe1bf408f6f8b3271ebda..da87ef889929ba959c1f517478e48c40c24823ec 100644 (file)
--- a/auto-modes.el
+++ b/auto-modes.el
@@ -24,11 +24,11 @@
        ;; ebuild-mode
        '("\\.ebuild$" . ebuild-mode)
 
-       ;; ecmascript-mode
-       '("\\.js$" . ecmascript-mode)
+       ;; js-mode
+       '("\\.js$" . js-mode)
 
        ;; haskell-mode
-       '("\\.hs$" . haskell-mode)
+       '("\\.l?hs$" . haskell-mode)
        
        ;; nagios-mode
        '("\\.cfg$" . nagios-mode)
@@ -39,12 +39,13 @@
        '("\\.xml$" . nxml-mode)
        '("\\.?html$" . nxml-mode)
        '("\\.config$" . nxml-mode)
-       '("\\.tpl$" . nxml-mode)
+       '("\\.tpl$" . nxml-mode) ;; Smarty templates
        '("\\.rdf$" . nxml-mode)
        '("\\.xul$" . nxml-mode)
                               
        ;; php-mode
        '("\\.php$" . php-mode)
+       '("\\.module$" . php-mode) ;; Drupal modules
                               
        ;; python-mode
        '("\\.pyx?$" . python-mode)