summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2015-08-21 16:06:21 +0300
committerEli Zaretskii <eliz@gnu.org>2015-08-21 16:06:21 +0300
commitb67928e650803efc0875fbb16e23b29dca6e06b7 (patch)
treef0fe0991f9150c550ce9a0b2a125dba5c401d884 /lisp
parenta55c75ccfe0a47db3eea8989bf4230ff702c6bde (diff)
parent9f31fb2a660a26ba510568fae102afc68db8f385 (diff)
downloademacs-b67928e650803efc0875fbb16e23b29dca6e06b7.tar.gz
Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
Diffstat (limited to 'lisp')
-rw-r--r--lisp/progmodes/js.el5
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."
;; the buffer containing the problem, JIT-lock will apply the
;; correct syntax to the regular expression literal and the problem
;; will mysteriously disappear.
- ;; FIXME: We should actually do this fontification lazily by adding
+ ;; FIXME: We should instead do this fontification lazily by adding
;; calls to syntax-propertize wherever it's really needed.
- (syntax-propertize (point-max)))
+ ;;(syntax-propertize (point-max))
+ )
;;;###autoload (defalias 'javascript-mode 'js-mode)