[elpa] externals/phps-mode 8a3b3df3f4 4/5: Backward-looking-at not using carriage return work-around anymore

[Christian Johansson]

branch: externals/phps-mode
commit 8a3b3df3f40fe19b46b09a57066f75d099305b7c
Author: Christian Johansson <christian@cvj.se>
Commit: Christian Johansson <christian@cvj.se>

    Backward-looking-at not using carriage return work-around anymore
---
 phps-mode-indent.el | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/phps-mode-indent.el b/phps-mode-indent.el
index 58a2e2bf0c..75c81a545b 100644
--- a/phps-mode-indent.el
+++ b/phps-mode-indent.el
@@ -30,13 +30,12 @@
       (setq limit (1- point)))
     (let* ((start (- point limit))
            (backward-string
-            (replace-regexp-in-string
-             "\n"
-             "\r"
-             (buffer-substring-no-properties
-              start
-              (1+ point)))))
-      (if (string-match regexp backward-string)
+            (buffer-substring-no-properties
+             start
+             (1+ point))))
+      (if (string-match
+           regexp
+           backward-string)
           backward-string
         nil))))
 
@@ -705,7 +704,7 @@
                  'line-after-extends-or-implements2)
                 (when-let ((backwards-string
                             (phps-mode-indent--backwards-looking-at
-                             "\r+\\([\t ]*\\)class[\r\t ]+[a-zA-Z0-9_]+[\r\t 
]+\\(extends[\r\t ]+[a-zA-Z0-9_]+\\)?[\r\t ]*\\(implements[\r\t 
]+[a-zA-Z0-9_]+\\)?$")))
+                             "\n+\\([\t ]*\\)class[\n\t ]+[a-zA-Z0-9_]+[\n\t 
]+\\(extends[\n\t ]+[a-zA-Z0-9_]+\\)?[\n\t ]*\\(implements[\n\t 
]+[a-zA-Z0-9_]+\\)?\\'")))
                   (let ((old-indentation
                          (length
                           (match-string 1 backwards-string))))
@@ -725,7 +724,7 @@
                  current-line-starts-with-opening-bracket
                  (string= current-line-starts-with-opening-bracket "{")
                  (phps-mode-indent--backwards-looking-at
-                  "[\r\t ]+implements\\([\r\t ]+[\\a-zA-Z_0-9_]+,?\\)+[\r\t 
]*{$")
+                  "[\n\t ]+implements\\([\n\t ]+[\\a-zA-Z_0-9_]+,?\\)+[\n\t 
]*{\\'")
                  (not
                   (string-match-p
                    "[\t ]*\\(class\\|interface\\)[\t ]+"