# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1288900412 -7200
# Node ID 1779f42a2b2b6a238eb0ccd77befcb1c33eeab3c
# Parent  ed5ef1f0855f6ee57e55c7ce835f529345afe93e# Parent  79bcafd3d45f7718a7faa198f3ae9d805a8d32b1
merged

diff -r ed5ef1f0855f -r 1779f42a2b2b .emacs-my
--- a/.emacs-my	Fri Oct 29 20:37:48 2010 +0300
+++ b/.emacs-my	Thu Nov 04 21:53:32 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.