diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-01-21 15:48:20 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-01-21 15:48:20 -0500 |
| commit | 0f1f97caf2128c133ec7c7fae742d6334a912d1b (patch) | |
| tree | ba8b2dafe44955beeff30e12e2921893652e2892 | |
| parent | 26a27884805a63e39f46f612fbe6f8fa618c499d (diff) | |
| download | emacs-0f1f97caf2128c133ec7c7fae742d6334a912d1b.tar.gz | |
* lisp/progmodes/js.el (js--regexp-literal): Count backslashes.
Fixes: debbugs:7882
| -rw-r--r-- | lisp/ChangeLog | 18 | ||||
| -rw-r--r-- | lisp/progmodes/js.el | 2 |
2 files changed, 12 insertions, 8 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 83f3e3f5bc4..380c082d82e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2011-01-21 Stefan Monnier <monnier@iro.umontreal.ca> + + * progmodes/js.el (js--regexp-literal): Count backslashes (bug#7882). + 2011-01-21 Jari Aalto <jari.aalto@cante.net> * emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine): (bug#7705) @@ -28,12 +32,12 @@ 2011-01-14 Kenichi Handa <handa@m17n.org> - * mail/rmailmm.el (rmail-mime-insert-header): Set - rmail-mime-coding-system to a cons whose car is the last coding + * mail/rmailmm.el (rmail-mime-insert-header): + Set rmail-mime-coding-system to a cons whose car is the last coding system used to decode the header. (rmail-mime-find-header-encoding): New function. - (rmail-mime-insert-decoded-text): Override - rmail-mime-coding-system if it is a cons. + (rmail-mime-insert-decoded-text): + Override rmail-mime-coding-system if it is a cons. (rmail-show-mime): If only a header part was decoded, find the coding system while ignoring mm-charset-override-alist. @@ -46,8 +50,8 @@ * mail/rmailmm.el (rmail-mime-next-item) (rmail-mime-previous-item): Delete them. (rmail-mime-shown-mode): Recursively call for children. - (rmail-mime-hidden-mode): Delete the 2nd arg TOP. Callers - changed. + (rmail-mime-hidden-mode): Delete the 2nd arg TOP. + Callers changed. (rmail-mime-raw-mode): Recursively call for children. (rmail-mode-map): Change mapping of tab and backtab to forward-button and backward-button respectively. @@ -56,7 +60,7 @@ (rmail-mime-update-tagline): New function. (rmail-mime-insert-text): Call rmail-mime-update-tagline if the body display is changed. - (rmail-mime-toggle-button): Renamed from rmail-mime-image. + (rmail-mime-toggle-button): Rename from rmail-mime-image. (rmail-mime-image): Delete this button type. (rmail-mime-toggle): New button type. (rmail-mime-insert-bulk): Call rmail-mime-update-tagline if the diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el index 56b9f4c5358..3fb22d85777 100644 --- a/lisp/progmodes/js.el +++ b/lisp/progmodes/js.el @@ -1654,7 +1654,7 @@ This performs fontification according to `js--class-styles'." ;; as the newline is escaped with \. Account for that in the regexp ;; below. (defconst js--regexp-literal - "[=(,:]\\(?:\\s-\\|\n\\)*\\(/\\)\\(?:\\\\/\\|[^/*]\\)\\(?:\\\\/\\|[^/]\\)*\\(/\\)" + "[=(,:]\\(?:\\s-\\|\n\\)*\\(/\\)\\(?:\\\\.\\|[^/*\\]\\)\\(?:\\\\.\\|[^/\\]\\)*\\(/\\)" "Regexp matching a JavaScript regular expression literal. Match groups 1 and 2 are the characters forming the beginning and end of the literal.") |