[elpa] externals/phps-mode e8a8d41 204/405: Merged remote changes

[Stefan Monnier]

branch: externals/phps-mode
commit e8a8d41fd9435f34aba2661b56da4d688289c6c4
Merge: 8947e6e 2d4646f
Author: Christian Johansson <address@hidden>
Commit: Christian Johansson <address@hidden>

    Merged remote changes
---
 phps-mode-functions.el      | 13 +++++++++++++
 phps-mode-test-functions.el |  5 ++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/phps-mode-functions.el b/phps-mode-functions.el
index ff64e48..d54953c 100644
--- a/phps-mode-functions.el
+++ b/phps-mode-functions.el
@@ -238,17 +238,30 @@
                                 (progn
                                   (setq line-contained-nesting-increase t)
                                   (when 
after-special-control-structure-first-on-line
+<<<<<<< HEAD
                                     (setq alternative-control-structure-level 
(1+ alternative-control-structure-level))))
+=======
+                                    (setq first-token-is-nesting-decrease t)))
+>>>>>>> 2d4646f2f1e8faf4a79f6b36f30140c233592430
 
                               (when (equal 
after-special-control-structure-token 'T_SWITCH)
                                 (setq alternative-control-structure-level (1+ 
alternative-control-structure-level))
                                 (setq allow-custom-column-increment t))
+<<<<<<< HEAD
 
                               (setq alternative-control-structure-level (1+ 
alternative-control-structure-level))
                               (setq line-contained-nesting-increase t)
                               (when 
after-special-control-structure-first-on-line
                                 (setq first-token-is-nesting-increase t))))
 
+=======
+
+                              (setq alternative-control-structure-level (1+ 
alternative-control-structure-level))
+                              (setq line-contained-nesting-increase t)
+                              (when 
after-special-control-structure-first-on-line
+                                (setq first-token-is-nesting-increase t))))
+
+>>>>>>> 2d4646f2f1e8faf4a79f6b36f30140c233592430
                         ;; (message "Started inline control-structure after %s 
at %s" after-special-control-structure-token token)
                         (setq in-inline-control-structure t)
                         (setq temp-pre-indent (1+ column-level))))
diff --git a/phps-mode-test-functions.el b/phps-mode-test-functions.el
index 077598b..ef110cc 100644
--- a/phps-mode-test-functions.el
+++ b/phps-mode-test-functions.el
@@ -112,6 +112,7 @@
 
   )
 
+<<<<<<< HEAD
 (defun phps-mode-test-functions-get-lines-indent-multi-line-assignments ()
   "Test for multi-line assignments."
 
@@ -148,6 +149,8 @@
 
   )
 
+=======
+>>>>>>> 2d4646f2f1e8faf4a79f6b36f30140c233592430
 (defun phps-mode-test-functions-get-lines-indent-inline-if ()
   "Test for inline if indentations."
 
@@ -184,7 +187,7 @@
   (phps-mode-test-with-buffer
    "<?php\nif (true):\n    echo 'Something';\nelseif (true\n    && true):\n    
echo 'Something';\nelse:\n    echo 'Something else';\n    echo 'Something else 
again';\nendif;\necho true;\n"
    "Alternative control structures with multi-line elseif 2"
-   (should (equal '((1 (0 0)) (2 (0 0)) (3 (1 0)) (4 (0 0)) (5 (0 0)) (6 (1 
0)) (7 (0 0)) (8 (1 0)) (9 (1 0)) (10 (0 0)) (11 (0 0))) 
(phps-mode-test-functions--hash-to-list 
(phps-mode-functions-get-lines-indent)))))
+   (should (equal '((1 (0 0)) (2 (0 0)) (3 (1 0)) (4 (0 0)) (5 (1 0)) (6 (1 
0)) (7 (0 0)) (8 (1 0)) (9 (1 0)) (10 (0 0)) (11 (0 0))) 
(phps-mode-test-functions--hash-to-list 
(phps-mode-functions-get-lines-indent)))))
 
   )