Version 8.0.1.

[gnu-emacs-elpa] / context-coloring-javascript.el

diff --git a/context-coloring-javascript.el b/context-coloring-javascript.el
index 7161fe6951c7548c5b5cbb509639877dcb726835..d145184be63f8c1ae007902acaa644137822f661 100644 (file)
--- a/context-coloring-javascript.el
+++ b/context-coloring-javascript.el
@@ -42,11 +42,6 @@ this for ES6 code; disable it elsewhere."
   :safe #'booleanp
   :group 'context-coloring)
 
-(make-obsolete-variable
- 'context-coloring-js-block-scopes
- 'context-coloring-javascript-block-scopes
- "7.0.0")
-
 (defsubst context-coloring-js2-scope-level (scope initial)
   "Return the level of SCOPE, starting from INITIAL."
   (cond ((gethash scope context-coloring-js2-scope-level-hash-table))
@@ -143,7 +138,6 @@ this for ES6 code; disable it elsewhere."
    "\\)")
   "Match a comment body hinting at a Node.js program.")
 
-;; TODO: Add ES6 module detection.
 (defun context-coloring-js2-top-level-local-p ()
   "Guess whether top-level variables are local.
 For instance, the current file could be a Node.js program."
@@ -220,16 +214,18 @@ For instance, the current file could be a Node.js program."
    (t
     (context-coloring-js2-colorize-ast))))
 
-(context-coloring-define-dispatch
+;;;###autoload
+(puthash
  'javascript
- :modes '(js2-mode js2-jsx-mode)
- :colorizer #'context-coloring-js2-colorize
- :setup
- (lambda ()
-   (add-hook 'js2-post-parse-callbacks #'context-coloring-colorize nil t))
- :teardown
- (lambda ()
-   (remove-hook 'js2-post-parse-callbacks #'context-coloring-colorize t)))
+ (list :modes '(js2-mode js2-jsx-mode)
+       :colorizer #'context-coloring-js2-colorize
+       :setup
+       (lambda ()
+         (add-hook 'js2-post-parse-callbacks #'context-coloring-colorize nil t))
+       :teardown
+       (lambda ()
+         (remove-hook 'js2-post-parse-callbacks #'context-coloring-colorize t)))
+ context-coloring-dispatch-hash-table)
 
 (provide 'context-coloring-javascript)