[Emacs-diffs] /srv/bzr/emacs/trunk r107579: * semantic/wisent/javascript.el (js-mode): Define `js-mode' as

[David Engster]

------------------------------------------------------------
revno: 107579
committer: David Engster <address@hidden>
branch nick: trunk
timestamp: Sun 2012-03-11 21:29:14 +0100
message:
  * semantic/wisent/javascript.el (js-mode): Define `js-mode' as
    child-mode of `javascript-mode' (bug #8445).
modified:
  lisp/cedet/ChangeLog
  lisp/cedet/semantic/wisent/javascript.el

=== modified file 'lisp/cedet/ChangeLog'
--- a/lisp/cedet/ChangeLog      2012-02-28 08:17:21 +0000
+++ b/lisp/cedet/ChangeLog      2012-03-11 20:29:14 +0000
@@ -1,3 +1,8 @@
+2012-03-11  David Engster  <address@hidden>
+
+       * semantic/wisent/javascript.el (js-mode): Define `js-mode' as
+       child-mode of `javascript-mode' (bug #8445).
+
 2012-02-28  Glenn Morris  <address@hidden>
 
        * semantic/db.el (semanticdb-search-results-table):

=== modified file 'lisp/cedet/semantic/wisent/javascript.el'
--- a/lisp/cedet/semantic/wisent/javascript.el  2012-01-19 07:21:25 +0000
+++ b/lisp/cedet/semantic/wisent/javascript.el  2012-03-11 20:29:14 +0000
@@ -75,6 +75,10 @@
 ;;
 ;; 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)