diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/progmodes/js.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9cae9b97c2e..789f59e1b42 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-12-23 Stefan Monnier <monnier@iro.umontreal.ca> + + * progmodes/js.el (js-syntax-propertize): "return" can't be divided + (bug#19397). + 2014-12-23 Michael Albinus <michael.albinus@gmx.de> * net/tramp.el (tramp-read-passwd): Ignore errors from `auth-source-*'. diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el index 56569e1f972..0d81a0a22ae 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))) |