[elpa] externals/phps-mode 73b8b4d 297/405: More work on concatenation and assignment indent

[Stefan Monnier]

branch: externals/phps-mode
commit 73b8b4d088acbc2649121c5ffcd9437a9d13a0d3
Author: Christian Johansson <address@hidden>
Commit: Christian Johansson <address@hidden>

    More work on concatenation and assignment indent
---
 phps-mode-functions.el | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/phps-mode-functions.el b/phps-mode-functions.el
index 5d5d2b7..a70d184 100644
--- a/phps-mode-functions.el
+++ b/phps-mode-functions.el
@@ -457,6 +457,8 @@
                     (if (or (string= token ";")
                             (and (string= token ")")
                                  (<= round-bracket-level 
in-assignment-round-bracket-level))
+                            (and (string= token ",")
+                                 (<= round-bracket-level 
in-assignment-round-bracket-level))
                             (and (string= token"]")
                                  (<= square-bracket-level 
in-assignment-square-bracket-level)))
                         (progn
@@ -468,7 +470,7 @@
                         ))
                   (when (and (not after-special-control-structure)
                              (string= token "="))
-                    ;; (message "Started assignment")
+                    (message "Started assignment")
                     (setq in-assignment t)
                     (setq in-assignment-round-bracket-level 
round-bracket-level)
                     (setq in-assignment-square-bracket-level 
square-bracket-level)
@@ -671,7 +673,6 @@
                         (setq first-token-on-line t)
                         (setq first-token-is-nesting-decrease nil)
                         (setq first-token-is-inline-html nil)
-                        (setq in-assignment-level 0)
                         (setq in-class-declaration-level 0)
                         (setq class-declaration-started-this-line nil)
                         (setq in-heredoc-started-this-line nil)