Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
14c37390
Commit
14c37390
authored
Dec 23, 2014
by
Stefan Monnier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* lisp/progmodes/js.el (js-syntax-propertize): "return" can't be divided.
Fixes: debbugs:19397
parent
ea78112b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
lisp/ChangeLog
lisp/ChangeLog
+5
-0
lisp/progmodes/js.el
lisp/progmodes/js.el
+1
-1
No files found.
lisp/ChangeLog
View file @
14c37390
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-*'.
...
...
lisp/progmodes/js.el
View file @
14c37390
...
...
@@ -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
)))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment