2 files changed, 6 insertions, 1 deletions

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  <dgutov@yandex.ru>
+
+        * 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  <dgutov@yandex.ru>
 
         * 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) ?\;)))