diff options
| author | David Engster <dengste@eml.cc> | 2012-03-11 21:29:14 +0100 |
|---|---|---|
| committer | David Engster <dengste@eml.cc> | 2012-03-11 21:29:14 +0100 |
| commit | da4189812bace1bbe147afad580a37ad37343ef0 (patch) | |
| tree | 0bc2244981b0dc89d28601262655a0e810a7f3e7 | |
| parent | 8d815e3c6aa3564749c19d8a35a006508daa2b3e (diff) | |
* semantic/wisent/javascript.el (js-mode): Define `js-mode' as
child-mode of `javascript-mode' (bug #8445).
| -rw-r--r-- | lisp/cedet/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/cedet/semantic/wisent/javascript.el | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog index 4dc5fe4df2..ec7fdcecca 100644 --- a/lisp/cedet/ChangeLog +++ b/lisp/cedet/ChangeLog @@ -1,3 +1,8 @@ +2012-03-11 David Engster <deng@randomsample.de> + + * semantic/wisent/javascript.el (js-mode): Define `js-mode' as + child-mode of `javascript-mode' (bug #8445). + 2012-02-28 Glenn Morris <rgm@gnu.org> * semantic/db.el (semanticdb-search-results-table): diff --git a/lisp/cedet/semantic/wisent/javascript.el b/lisp/cedet/semantic/wisent/javascript.el index 33644414b3..8ed83e87bc 100644 --- a/lisp/cedet/semantic/wisent/javascript.el +++ b/lisp/cedet/semantic/wisent/javascript.el @@ -75,6 +75,10 @@ This function overrides `get-local-variables'." ;; ;; This sets up the javascript parser +;; Since javascript-mode is an alias for js-mode, let it inherit all +;; the overrides. +(define-child-mode js-mode javascript-mode) + ;; In semantic-imenu.el, not part of Emacs. (defvar semantic-imenu-summary-function) |