From: Mattias Engdegård <mattiase@acm.org>
Date: Thu, 13 Jun 2024 08:49:28 +0000 (+0200)
Subject: php-ts-mode: minor fixes
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1228cb751bf8d7efc909909d821ea01bebd140ff;p=emacs.git

php-ts-mode: minor fixes

* lisp/progmodes/php-ts-mode.el (php-ts-mode-flymake-php):
Don't use `any` to mean `not-newline`; it's misleading.
(php-ts-mode--predefined-constant): Remove duplicate "E_USER_NOTICE".

(cherry picked from commit 59367f6a3a9dd7fb30429494b622ebdec94e6e32)
---

diff --git a/lisp/progmodes/php-ts-mode.el b/lisp/progmodes/php-ts-mode.el
index 3473057edd4..6a576d9c7c5 100644
--- a/lisp/progmodes/php-ts-mode.el
+++ b/lisp/progmodes/php-ts-mode.el
@@ -242,8 +242,8 @@ Calls REPORT-FN directly."
                                (rx bol (? "PHP ") ;; every dignostic line start with PHP
                                    (group (or "Fatal" "Parse")) ;; 1: type
                                    " error:" (+ (syntax whitespace))
-                                   (group (+? any)) ;; 2: msg
-                                   " in " (group (+? any)) ;; 3: file
+                                   (group (+? nonl)) ;; 2: msg
+                                   " in " (group (+? nonl)) ;; 3: file
                                    " on line " (group (+ num)) ;; 4: line
                                    eol))))
     (save-restriction
@@ -739,7 +739,7 @@ characters of the current line."
     "PHP_SHLIB_SUFFIX" "PHP_FD_SETSIZE" "E_ERROR" "E_WARNING" "E_PARSE"
     "E_NOTICE" "E_CORE_ERROR" "E_CORE_WARNING" "E_COMPILE_ERROR"
     "E_COMPILE_WARNING" "E_USER_ERROR" "E_USER_WARNING"
-    "E_USER_NOTICE" "E_USER_NOTICE" "E_DEPRECATED" "E_USER_DEPRECATED"
+    "E_USER_NOTICE" "E_DEPRECATED" "E_USER_DEPRECATED"
     "E_ALL" "E_STRICT"
     ;; magic constant
     "__COMPILER_HALT_OFFSET__" "__CLASS__" "__DIR__" "__FILE__"