From: Dmitry Gutov Date: Thu, 7 Mar 2013 16:08:33 +0000 (+0400) Subject: * lisp/progmodes/js.el (js--multi-line-declaration-indentation): Merge X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~2026^2~601 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=94e48c7d758beb0845ba16fd8ff12de6999e5d55;p=emacs.git * lisp/progmodes/js.el (js--multi-line-declaration-indentation): Merge from js2-mode (https://github.com/mooz/js2-mode/issues/89). --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index cef47715dc0..709242e6006 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2013-03-07 Dmitry Gutov + + * progmodes/js.el (js--multi-line-declaration-indentation): Merge + from js2-mode (https://github.com/mooz/js2-mode/issues/89). + 2013-03-06 Dmitry Gutov * progmodes/ruby-mode.el (ruby-syntax-propertize-function): Only diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el index 4aa1ac270d5..2ea78fc321c 100644 --- a/lisp/progmodes/js.el +++ b/lisp/progmodes/js.el @@ -1785,7 +1785,7 @@ 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) ?\;)))