From: Dmitry Gutov <dgutov@yandex.ru>
Date: Thu, 5 Mar 2015 02:33:36 +0000 (+0200)
Subject: Teach js-mode about ES6 template strings
X-Git-Tag: emacs-25.0.90~2564^2~220
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=77ab7f84550993b44550879e10cd917b7bf02d04;p=emacs.git

Teach js-mode about ES6 template strings

* lisp/progmodes/js.el (js-mode-syntax-table): Add an entry for `.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d4bc0af3eff..3486c3806fd 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2015-03-05  Dmitry Gutov  <dgutov@yandex.ru>
+
+	* progmodes/js.el (js-mode-syntax-table): Add an entry for `.
+
 2015-03-05  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	Replace *-function vars with generic functions in cl-generic.
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index c25e52cdc6a..d7712e4c49e 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -534,6 +534,7 @@ getting timeout messages."
   (let ((table (make-syntax-table)))
     (c-populate-syntax-table table)
     (modify-syntax-entry ?$ "_" table)
+    (modify-syntax-entry ?` "\"" table)
     table)
   "Syntax table for `js-mode'.")
 
diff --git a/test/indent/js.js b/test/indent/js.js
index 2d458e1b769..d330fa06d5b 100644
--- a/test/indent/js.js
+++ b/test/indent/js.js
@@ -60,3 +60,6 @@ var evens = [e for each (e in range(0, 21))
 a++
 b +=
   c
+
+baz(`http://foo.bar/${tee}`)
+  .qux();