aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2012-05-25 11:03:22 -0400
committerStefan Monnier2012-05-25 11:03:22 -0400
commita8d3cbf75d219d7a249fc0623219511179e959da (patch)
treeb702b60a138958f5a67ed155c7c60afcb35c1aa0
parente8d32c7e803ad2b790627876bf7afc9381f252c9 (diff)
downloademacs-a8d3cbf75d219d7a249fc0623219511179e959da.tar.gz
emacs-a8d3cbf75d219d7a249fc0623219511179e959da.zip
* lisp/progmodes/js.el: Add notes in comments.
-rw-r--r--lisp/progmodes/js.el7
1 files changed, 6 insertions, 1 deletions
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index 1c8a1f45e57..cdc3ef1c2e0 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -1646,6 +1646,11 @@ This performs fontification according to `js--class-styles'."
1646 (funcall 1646 (funcall
1647 (syntax-propertize-rules 1647 (syntax-propertize-rules
1648 ;; Distinguish /-division from /-regexp chars (and from /-comment-starter). 1648 ;; Distinguish /-division from /-regexp chars (and from /-comment-starter).
1649 ;; FIXME: Allow regexps after infix ops like + ...
1650 ;; https://developer.mozilla.org/en/JavaScript/Reference/Operators
1651 ;; We can probably just add +, -, !, <, >, %, ^, ~, |, &, ?, : at which
1652 ;; point I think only * and / would be missing which could also be added,
1653 ;; but need care to avoid affecting the // and */ comment markers.
1649 ("\\(?:^\\|[=([{,:;]\\)\\(?:[ \t]\\)*\\(/\\)[^/*]" 1654 ("\\(?:^\\|[=([{,:;]\\)\\(?:[ \t]\\)*\\(/\\)[^/*]"
1650 (1 (ignore 1655 (1 (ignore
1651 (forward-char -1) 1656 (forward-char -1)
@@ -3324,7 +3329,7 @@ If one hasn't been set, or if it's stale, prompt for a new one."
3324 comment-start-skip "\\(//+\\|/\\*+\\)\\s *") 3329 comment-start-skip "\\(//+\\|/\\*+\\)\\s *")
3325 3330
3326 (set (make-local-variable 'electric-indent-chars) 3331 (set (make-local-variable 'electric-indent-chars)
3327 (append "{}():;," electric-indent-chars)) 3332 (append "{}():;," electric-indent-chars)) ;FIXME: js2-mode adds "[]*".
3328 (set (make-local-variable 'electric-layout-rules) 3333 (set (make-local-variable 'electric-layout-rules)
3329 '((?\; . after) (?\{ . after) (?\} . before))) 3334 '((?\; . after) (?\{ . after) (?\} . before)))
3330 3335