[Emacs-diffs] emacs-24 14c3739: * lisp/progmodes/js.el (js-syntax-propertize): "return" can't be divided.

[Stefan Monnier]

branch: emacs-24
commit 14c3739040a60bfe6ed0a3ce0aa90a4758155e28
Author: Stefan Monnier <address@hidden>
Commit: Stefan Monnier <address@hidden>

    * lisp/progmodes/js.el (js-syntax-propertize): "return" can't be divided.
    
    Fixes: debbugs:19397
---
 lisp/ChangeLog       |    5 +++++
 lisp/progmodes/js.el |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9cae9b9..789f59e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-23  Stefan Monnier  <address@hidden>
+
+       * progmodes/js.el (js-syntax-propertize): "return" can't be divided
+       (bug#19397).
+
 2014-12-23  Michael Albinus  <address@hidden>
 
        * net/tramp.el (tramp-read-passwd): Ignore errors from `auth-source-*'.
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index 56569e1..0d81a0a 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -1656,7 +1656,7 @@ This performs fontification according to 
`js--class-styles'."
     ;; We can probably just add +, -, !, <, >, %, ^, ~, |, &, ?, : at which
     ;; point I think only * and / would be missing which could also be added,
     ;; but need care to avoid affecting the // and */ comment markers.
-    ("\\(?:^\\|[=([{,:;]\\)\\(?:[ \t]\\)*\\(/\\)[^/*]"
+    ("\\(?:^\\|[=([{,:;]\\|\\_<return\\_>\\)\\(?:[ \t]\\)*\\(/\\)[^/*]"
      (1 (ignore
         (forward-char -1)
          (when (or (not (memq (char-after (match-beginning 0)) '(?\s ?\t)))