aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2009-10-03 20:30:43 +0000
committerChong Yidong2009-10-03 20:30:43 +0000
commit0b8cafba2c8011de6cf378047ebb7e63c34ee800 (patch)
tree15f4fdd5a4440bb9f829f0970062828a6168aa72
parenta70bfe61c012cb15c42d7df18d36d3650ad6071b (diff)
downloademacs-0b8cafba2c8011de6cf378047ebb7e63c34ee800.tar.gz
emacs-0b8cafba2c8011de6cf378047ebb7e63c34ee800.zip
* cedet/semantic.el (semantic-mode): Use js-mode-hook for Javascript hook.
-rw-r--r--lisp/ChangeLog1
-rw-r--r--lisp/cedet/semantic.el4
2 files changed, 3 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 024848e50db..08d9eb1ed00 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -11,6 +11,7 @@
11 11
12 * cedet/semantic.el (semantic-mode): Handle 12 * cedet/semantic.el (semantic-mode): Handle
13 srecode-template-mode-hook as well. 13 srecode-template-mode-hook as well.
14 (semantic-mode): Use js-mode-hook for Javascript hook.
14 15
15 * cedet/srecode/template.el: Remove hook variable. 16 * cedet/srecode/template.el: Remove hook variable.
16 17
diff --git a/lisp/cedet/semantic.el b/lisp/cedet/semantic.el
index 03b04f1d5a5..e7f333def09 100644
--- a/lisp/cedet/semantic.el
+++ b/lisp/cedet/semantic.el
@@ -1048,7 +1048,7 @@ Semantic mode.
1048 (semanticdb-load-ebrowse-caches))) 1048 (semanticdb-load-ebrowse-caches)))
1049 (add-hook 'mode-local-init-hook 'semantic-new-buffer-fcn) 1049 (add-hook 'mode-local-init-hook 'semantic-new-buffer-fcn)
1050 ;; Add mode-local hooks 1050 ;; Add mode-local hooks
1051 (add-hook 'javascript-mode-hook 'wisent-javascript-setup-parser) 1051 (add-hook 'js-mode-hook 'wisent-javascript-setup-parser)
1052 (add-hook 'ecmascript-mode-hook 'wisent-javascript-setup-parser) 1052 (add-hook 'ecmascript-mode-hook 'wisent-javascript-setup-parser)
1053 (add-hook 'java-mode-hook 'wisent-java-default-setup) 1053 (add-hook 'java-mode-hook 'wisent-java-default-setup)
1054 (add-hook 'scheme-mode-hook 'semantic-default-scheme-setup) 1054 (add-hook 'scheme-mode-hook 'semantic-default-scheme-setup)
@@ -1060,7 +1060,7 @@ Semantic mode.
1060 (add-hook 'srecode-template-mode-hook 'srecode-template-setup-parser)) 1060 (add-hook 'srecode-template-mode-hook 'srecode-template-setup-parser))
1061 ;; Disable all Semantic features. 1061 ;; Disable all Semantic features.
1062 (remove-hook 'mode-local-init-hook 'semantic-new-buffer-fcn) 1062 (remove-hook 'mode-local-init-hook 'semantic-new-buffer-fcn)
1063 (remove-hook 'javascript-mode-hook 'wisent-javascript-setup-parser) 1063 (remove-hook 'js-mode-hook 'wisent-javascript-setup-parser)
1064 (remove-hook 'ecmascript-mode-hook 'wisent-javascript-setup-parser) 1064 (remove-hook 'ecmascript-mode-hook 'wisent-javascript-setup-parser)
1065 (remove-hook 'java-mode-hook 'wisent-java-default-setup) 1065 (remove-hook 'java-mode-hook 'wisent-java-default-setup)
1066 (remove-hook 'scheme-mode-hook 'semantic-default-scheme-setup) 1066 (remove-hook 'scheme-mode-hook 'semantic-default-scheme-setup)