aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Tamm2002-12-10 16:57:48 +0000
committerSteven Tamm2002-12-10 16:57:48 +0000
commit3ce073568eef493700263a843952886a76996057 (patch)
tree54c79c0a89b49290086a13a5312d31ac91a36eda
parent810e89c7698eed8a519ab52c1aeee0b074994511 (diff)
downloademacs-3ce073568eef493700263a843952886a76996057.tar.gz
emacs-3ce073568eef493700263a843952886a76996057.zip
javascript-generic-mode: Added C style block comment as used in ECMA-262
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/generic-x.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ec57d0973e9..5fc4b8d85ca 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12002-12-10 Steven Tamm <steventamm@mac.com>
2
3 * generic-x.el (javascript-generic-mode): Added C style block
4 comments as used in ECMA-262 standard.
5
12002-12-10 Kenichi Handa <handa@m17n.org> 62002-12-10 Kenichi Handa <handa@m17n.org>
2 7
3 * language/european.el ("Swedish"): Change tutorial file name to 8 * language/european.el ("Swedish"): Change tutorial file name to
diff --git a/lisp/generic-x.el b/lisp/generic-x.el
index 3b56320568c..6a878e79950 100644
--- a/lisp/generic-x.el
+++ b/lisp/generic-x.el
@@ -533,7 +533,7 @@ you must reload generic-x to enable the specified modes."
533;; Javascript mode 533;; Javascript mode
534;; Includes extra keywords from Armando Singer [asinger@MAIL.COLGATE.EDU] 534;; Includes extra keywords from Armando Singer [asinger@MAIL.COLGATE.EDU]
535(define-generic-mode 'javascript-generic-mode 535(define-generic-mode 'javascript-generic-mode
536 (list "//") 536 (list "//" '("/*" . "*/"))
537 (list 537 (list
538 "break" 538 "break"
539 "case" 539 "case"