From: Theodor Thornhill <theo@thornhill.no>
Date: Fri, 3 Sep 2021 10:14:32 +0000 (+0200)
Subject: Update to CSS Grid Layout Module Level 2
X-Git-Tag: emacs-28.0.90~1197
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=538a401b0c0ac245ad99b07605f0a69325eb511c;p=emacs.git

Update to CSS Grid Layout Module Level 2

* css-mode.el (css-property-alist): Update to the newer spec, and add
the subgrid keywords
---

diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el
index c2086d2fd3c..8689c94bc58 100644
--- a/lisp/textmodes/css-mode.el
+++ b/lisp/textmodes/css-mode.el
@@ -278,8 +278,8 @@
     ;; (https://www.w3.org/TR/css-contain-1/#property-index)
     ("contain" "none" "strict" "content" "size" "layout" "paint")
 
-    ;; CSS Grid Layout Module Level 1
-    ;; (https://www.w3.org/TR/css-grid-1/#property-index)
+    ;; CSS Grid Layout Module Level 2
+    ;; (https://www.w3.org/TR/css-grid-2/#property-index)
     ("grid" grid-template grid-template-rows "auto-flow" "dense"
      grid-auto-columns grid-auto-rows grid-template-columns)
     ("grid-area" grid-line)
@@ -298,8 +298,8 @@
     ("grid-template" "none" grid-template-rows grid-template-columns
      line-names string track-size line-names explicit-track-list)
     ("grid-template-areas" "none" string)
-    ("grid-template-columns" "none" track-list auto-track-list)
-    ("grid-template-rows" "none" track-list auto-track-list)
+    ("grid-template-columns" "none" track-list auto-track-list "subgrid")
+    ("grid-template-rows" "none" track-list auto-track-list "subgrid")
 
     ;; CSS Box Alignment Module Level 3
     ;; (https://www.w3.org/TR/css-align-3/#property-index)