# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1289336013 -7200
# Node ID 41662389565859b1bc5b963b3cd5c8309476d222
# Parent  1779f42a2b2b6a238eb0ccd77befcb1c33eeab3c# Parent  d1889d3244bee363be24f071a5063856b1dd3096
Automated merge with file:///cygdrive/e/srv/hg/dot-emacs

diff -r d1889d3244be -r 416623895658 .emacs-my
--- a/.emacs-my	Tue Nov 09 21:49:55 2010 +0200
+++ b/.emacs-my	Tue Nov 09 22:53:33 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.