]> code.delx.au - gnu-emacs-elpa/commitdiff
* js2-multiline-decl-indentation: Simplify a logical condition
authorDmitry Gutov <dgutov@yandex.ru>
Thu, 7 Mar 2013 16:12:12 +0000 (20:12 +0400)
committerDmitry Gutov <dgutov@yandex.ru>
Thu, 7 Mar 2013 16:12:12 +0000 (20:12 +0400)
js2-mode.el

index c8d56a3aeebdf869174bb108556ba2d2df681916..10655c5b073cfbb1ece847c152ab33a00ebc0733 100644 (file)
@@ -9593,11 +9593,10 @@ to a multiline declaration statement.  See `js2-pretty-multiline-declarations'."
                         (js2-backward-sws)
                         (or (eq (char-before) ?,)
                             (and (not (eq (char-before) ?\;))
-                                 (and
-                                  (prog2 (skip-syntax-backward ".")
-                                      (looking-at js2-indent-operator-re)
-                                    (js2-backward-sws))
-                                  (not (eq (char-before) ?\;))))
+                                 (prog2 (skip-syntax-backward ".")
+                                     (looking-at js2-indent-operator-re)
+                                   (js2-backward-sws))
+                                 (not (eq (char-before) ?\;)))
                             (js2-same-line pos)))))
           (condition-case err
               (backward-sexp)