mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-24 21:41:48 -08:00
Code Issues Projects Releases Wiki Activity

* lisp/progmodes/js.el (js-syntax-propertize): "return" can't be divided.

Browse source 
Fixes: debbugs:19397
This commit is contained in:
Stefan Monnier 2014-12-23 10:50:36 -05:00
parent ea78112b12
commit 14c3739040
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -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-*'.

2
lisp/progmodes/js.el
View file

@ -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)))