diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-05-13 07:45:30 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-05-13 07:45:30 -0700 |
| commit | 1adfb5ee55d16cd3d9d78998ae7bbb8e5708d9c5 (patch) | |
| tree | 8a02e7689c33e13e15120508d724c497a14847c4 /lisp/progmodes/js.el | |
| parent | 97c05cc892af85abd9438d2f685d08c557a0d9fb (diff) | |
| parent | 9c2a1a264cf418fcf187b95b49fe986b32ceabef (diff) | |
| download | emacs-1adfb5ee55d16cd3d9d78998ae7bbb8e5708d9c5.tar.gz | |
Merge from origin/emacs-25
9c2a1a2 * doc/misc/texinfo.tex: Sync from gnulib.
66cd4d8 * lisp/emacs-lisp/find-func.el (find-feature-regexp) (find-al...
1a5a05c Do not mistake colon at the end of regexp for slash symbol
4c5a00b Make package-install-from-buffer not move point
9596ea1 ; Revert "* emacs-lisp/lisp-mnt.el (lm-header): save-excursion"
f79c352 Redo the fix for bug#21839
8d2f78c Don't treat JS spread as contination method call
Diffstat (limited to 'lisp/progmodes/js.el')
| -rw-r--r-- | lisp/progmodes/js.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el index 9265e38e4bc..508195996b6 100644 --- a/lisp/progmodes/js.el +++ b/lisp/progmodes/js.el @@ -1745,7 +1745,7 @@ This performs fontification according to `js--class-styles'." "Regular expression matching variable declaration keywords.") (defconst js--indent-operator-re - (concat "[-+*/%<>&^|?:.]\\([^-+*/]\\|$\\)\\|!?=\\|" + (concat "[-+*/%<>&^|?:.]\\([^-+*/.]\\|$\\)\\|!?=\\|" (js--regexp-opt-symbol '("in" "instanceof"))) "Regexp matching operators that affect indentation of continued expressions.") |