diff options
| author | Dmitry Gutov | 2022-08-15 02:22:59 +0300 |
|---|---|---|
| committer | Dmitry Gutov | 2022-08-15 02:22:59 +0300 |
| commit | ee3a674c7c9e39fe7ff296ce1f9830fc45520de8 (patch) | |
| tree | e8ba1e7be54314f208454e80e3d31044c913f3eb /lisp/progmodes/js.el | |
| parent | fe0e53d963899a16e0dd1bbc1ba10a6b59f7989e (diff) | |
| parent | 0a8e88fd83db5398d36064a7f87cff5b57da7284 (diff) | |
| download | emacs-scratch/font_lock_large_files.tar.gz emacs-scratch/font_lock_large_files.zip | |
Merge branch 'master' into scratch/font_lock_large_filesscratch/font_lock_large_files
Diffstat (limited to 'lisp/progmodes/js.el')
| -rw-r--r-- | lisp/progmodes/js.el | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el index d2c24a75810..efad3b52aa9 100644 --- a/lisp/progmodes/js.el +++ b/lisp/progmodes/js.el | |||
| @@ -3490,9 +3490,10 @@ This function is intended for use in `after-change-functions'." | |||
| 3490 | 3490 | ||
| 3491 | ;;;###autoload | 3491 | ;;;###autoload |
| 3492 | (define-derived-mode js-json-mode js-mode "JSON" | 3492 | (define-derived-mode js-json-mode js-mode "JSON" |
| 3493 | ;; JSON files can be big. Speed up syntax-ppss. | 3493 | (setq-local js-enabled-frameworks nil) |
| 3494 | (setq-local syntax-propertize-function nil) | 3494 | ;; Speed up `syntax-ppss': JSON files can be big but can't hold |
| 3495 | (setq-local js-enabled-frameworks nil)) | 3495 | ;; regexp matchers nor #! thingies (and `js-enabled-frameworks' is nil). |
| 3496 | (setq-local syntax-propertize-function #'ignore)) | ||
| 3496 | 3497 | ||
| 3497 | ;; Since we made JSX support available and automatically-enabled in | 3498 | ;; Since we made JSX support available and automatically-enabled in |
| 3498 | ;; the base `js-mode' (for ease of use), now `js-jsx-mode' simply | 3499 | ;; the base `js-mode' (for ease of use), now `js-jsx-mode' simply |