update packages

lisp/web-mode/web-mode-pkg.el

@@ -1,12 +1,9 @@
-(define-package "web-mode" "20241227.530" "major mode for editing web templates"
+;; -*- no-byte-compile: t; lexical-binding: nil -*-
+(define-package "web-mode" "20250619.1334"
+  "Major mode for editing web templates."
   '((emacs "23.1"))
-  :commit "be2d59c8fa02b1a45ae54ce4079e502e659cefe6" :maintainers
-  '(("François-Xavier Bois" . "fxbois@gmail.com"))
-  :maintainer
-  '("François-Xavier Bois" . "fxbois@gmail.com")
-  :keywords
-  '("languages")
-  :url "https://web-mode.org")
-;; Local Variables:
-;; no-byte-compile: t
-;; End:
+  :url "https://web-mode.org"
+  :commit "994cb350bceeebb031406112cf6da119e066ef8e"
+  :revdesc "994cb350bcee"
+  :keywords '("languages")
+  :maintainers '(("François-Xavier Bois" . "fxbois@gmail.com")))

lisp/web-mode/web-mode.el

@@ -2,7 +2,8 @@
 
 ;; Copyright 2011-2024 François-Xavier Bois
 
-;; Version: 17.3.21
+;; Package-Version: 20250619.1334
+;; Package-Revision: 994cb350bcee
 ;; Author: François-Xavier Bois
 ;; Maintainer: François-Xavier Bois <fxbois@gmail.com>
 ;; Package-Requires: ((emacs "23.1"))
@@ -5478,7 +5479,8 @@ Also return non-nil if it is the command `self-insert-command' is remapped to."
         ;;(message "%S: %S (%S %S)" (point) (match-string-no-properties 0) reg-beg reg-end)
 
         (setq flags 0
-              tname (downcase (match-string-no-properties 1))
+              tnameraw (match-string-no-properties 1)
+              tname (downcase tnameraw)
               char (aref tname 0)
               tbeg (match-beginning 0)
               tend nil
@@ -5507,7 +5509,9 @@ Also return non-nil if it is the command `self-insert-command' is remapped to."
 
           ((not (member char '(?\! ?\?)))
            (cond
-             ((string-match-p "-" tname)
+             ((or (string-match-p "-" tname)
+                  (let ((case-fold-search nil))
+                    (string-match-p "^/?[[:upper:]][[:lower:]]" tnameraw)))
               (setq flags (logior flags 2)))
              ;;((string-match-p ":" tname)
              ;; (setq flags (logior flags 32)))
@@ -8682,7 +8686,7 @@ Also return non-nil if it is the command `self-insert-command' is remapped to."
          (cond
            ((string= web-mode-engine "blade")
             (save-excursion
-              (when (web-mode-rsf "{[{!]+[ ]*")
+              (when (web-mode-rsf "{[{!]+[ ]*\\|@props[ ]*[(]") ;; #1318
                 (setq reg-col (current-column))))
             (setq reg-beg (+ reg-beg 2))
             )
@@ -9647,7 +9651,10 @@ Also return non-nil if it is the command `self-insert-command' is remapped to."
                                                               reg-beg))))
 
           (t
-           (when debug (message "I430(%S) bracket-indentation" pos))
+           (when debug
+             (message "I430(%S) bracket-indentation" pos)
+             ;;(message "reg-col=%S curr-ind=%S lang=%S reg-beg=%S" reg-col curr-indentation language reg-beg)
+             )
            (setq offset (car (web-mode-bracket-indentation pos
                                                            reg-col
                                                            curr-indentation