* cedet/semantic.el (semantic-mode): Use js-mode-hook for Javascript hook.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 024848e50dba8998205fcbac9c5a1e4357454b3c..08d9eb1ed0016cbe46d9b00b347251e1d961e541 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -11,6 +11,7 @@
 
        * cedet/semantic.el (semantic-mode): Handle
        srecode-template-mode-hook as well.
+       (semantic-mode): Use js-mode-hook for Javascript hook.
 
        * cedet/srecode/template.el: Remove hook variable.
 

diff --git a/lisp/cedet/semantic.el b/lisp/cedet/semantic.el
index 03b04f1d5a5ec8ab63d463006fa4838df6b2e4b1..e7f333def0901ebd76ed522ad61f456a278e5f3b 100644 (file)
--- a/lisp/cedet/semantic.el
+++ b/lisp/cedet/semantic.el
@@ -1048,7 +1048,7 @@ Semantic mode.
            (semanticdb-load-ebrowse-caches)))
        (add-hook 'mode-local-init-hook 'semantic-new-buffer-fcn)
        ;; Add mode-local hooks
-       (add-hook 'javascript-mode-hook 'wisent-javascript-setup-parser)
+       (add-hook 'js-mode-hook 'wisent-javascript-setup-parser)
        (add-hook 'ecmascript-mode-hook 'wisent-javascript-setup-parser)
        (add-hook 'java-mode-hook 'wisent-java-default-setup)
        (add-hook 'scheme-mode-hook 'semantic-default-scheme-setup)
@@ -1060,7 +1060,7 @@ Semantic mode.
        (add-hook 'srecode-template-mode-hook 'srecode-template-setup-parser))
     ;; Disable all Semantic features.
     (remove-hook 'mode-local-init-hook 'semantic-new-buffer-fcn)
-    (remove-hook 'javascript-mode-hook 'wisent-javascript-setup-parser)
+    (remove-hook 'js-mode-hook 'wisent-javascript-setup-parser)
     (remove-hook 'ecmascript-mode-hook 'wisent-javascript-setup-parser)
     (remove-hook 'java-mode-hook 'wisent-java-default-setup)
     (remove-hook 'scheme-mode-hook 'semantic-default-scheme-setup)