diff -r 58e5a1067495 -r 79bcafd3d45f .emacs-my
--- a/.emacs-my	Mon Nov 01 22:22:50 2010 +0200
+++ b/.emacs-my	Mon Nov 01 23:25:12 2010 +0200
@@ -975,8 +975,6 @@
 
 (add-to-list 'auto-mode-alist '("\\.cu$" . c-mode))
 
-(add-to-list 'auto-mode-alist '("\\.js$" . js-mode))
-
 (defun my-c++-header-file-p ()
   "Return non-nil, if in a C++ header."
   (and (string-match "\\.h$"
@@ -1224,6 +1222,13 @@
             ))
     ))
 
+;;; ----------------------------------------------------------------
+;;; javascript, js.
+
+(if (>= emacs-major-version 23)
+    (add-to-list 'auto-mode-alist '("\\.js$" . js-mode))
+  (add-to-list 'auto-mode-alist '("\\.js$" . javascript-generic-mode))
+  )
 
 ;;; ----------------------------------------------------------------
 ;;; bat file, batch.