diff options
| author | Eli Zaretskii | 2015-08-21 16:06:21 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2015-08-21 16:06:21 +0300 |
| commit | b67928e650803efc0875fbb16e23b29dca6e06b7 (patch) | |
| tree | f0fe0991f9150c550ce9a0b2a125dba5c401d884 | |
| parent | a55c75ccfe0a47db3eea8989bf4230ff702c6bde (diff) | |
| parent | 9f31fb2a660a26ba510568fae102afc68db8f385 (diff) | |
| download | emacs-b67928e650803efc0875fbb16e23b29dca6e06b7.tar.gz emacs-b67928e650803efc0875fbb16e23b29dca6e06b7.zip | |
Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
| -rw-r--r-- | lisp/progmodes/js.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el index 40a4a1080b5..98a22dd8441 100644 --- a/lisp/progmodes/js.el +++ b/lisp/progmodes/js.el | |||
| @@ -3560,9 +3560,10 @@ If one hasn't been set, or if it's stale, prompt for a new one." | |||
| 3560 | ;; the buffer containing the problem, JIT-lock will apply the | 3560 | ;; the buffer containing the problem, JIT-lock will apply the |
| 3561 | ;; correct syntax to the regular expression literal and the problem | 3561 | ;; correct syntax to the regular expression literal and the problem |
| 3562 | ;; will mysteriously disappear. | 3562 | ;; will mysteriously disappear. |
| 3563 | ;; FIXME: We should actually do this fontification lazily by adding | 3563 | ;; FIXME: We should instead do this fontification lazily by adding |
| 3564 | ;; calls to syntax-propertize wherever it's really needed. | 3564 | ;; calls to syntax-propertize wherever it's really needed. |
| 3565 | (syntax-propertize (point-max))) | 3565 | ;;(syntax-propertize (point-max)) |
| 3566 | ) | ||
| 3566 | 3567 | ||
| 3567 | ;;;###autoload (defalias 'javascript-mode 'js-mode) | 3568 | ;;;###autoload (defalias 'javascript-mode 'js-mode) |
| 3568 | 3569 | ||