diff options
| author | Tom Tromey <tromey@redhat.com> | 2013-03-08 11:57:29 -0700 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2013-03-08 11:57:29 -0700 |
| commit | 71f91792e3013b397996905224f387da5cc539a9 (patch) | |
| tree | 4c3d3ba909e76deea1cdf73b73fca67a57149465 /lisp/progmodes/js.el | |
| parent | 6f4de085f065e11f4df3195d47479f28f5ef08ba (diff) | |
| parent | b5426561089d39f18b42bed9dbfcb531f43ed562 (diff) | |
| download | emacs-71f91792e3013b397996905224f387da5cc539a9.tar.gz | |
merge from trunk
Diffstat (limited to 'lisp/progmodes/js.el')
| -rw-r--r-- | lisp/progmodes/js.el | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el index 96e6039a8c2..2ea78fc321c 100644 --- a/lisp/progmodes/js.el +++ b/lisp/progmodes/js.el @@ -1785,13 +1785,13 @@ statement spanning multiple lines; otherwise, return nil." (or (eq (char-before) ?,) (and (not (eq (char-before) ?\;)) (prog2 - (skip-chars-backward "[[:punct:]]") + (skip-syntax-backward ".") (looking-at js--indent-operator-re) (js--backward-syntactic-ws)) (not (eq (char-before) ?\;))) (and (>= pos (point-at-bol)) (<= pos (point-at-eol))))))) - (condition-case err + (condition-case nil (backward-sexp) (scan-error (setq at-opening-bracket t)))) (when (looking-at js--declaration-keyword-re) @@ -3405,8 +3405,7 @@ If one hasn't been set, or if it's stale, prompt for a new one." ;; calls to syntax-propertize wherever it's really needed. (syntax-propertize (point-max))) -;;;###autoload -(defalias 'javascript-mode 'js-mode) +;;;###autoload (defalias 'javascript-mode 'js-mode) (eval-after-load 'folding '(when (fboundp 'folding-add-to-marks-list) |