Merge branch 'master' into feature/igc3feature/igc3

4 files changed, 20 insertions, 4 deletions

diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el
index a56fc018e18..355555df090 100644
--- a/lisp/textmodes/css-mode.el
+++ b/lisp/textmodes/css-mode.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2006-2026 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
-;; Maintainer: Simen Heggestøyl <simenheg@gmail.com>
+;; Maintainer: Simen Heggestøyl <simenheg@runbox.com>
 ;; Keywords: hypermedia
 
 ;; This file is part of GNU Emacs.
@@ -66,7 +66,7 @@
 
 (defconst css-pseudo-class-ids
   '("active" "checked" "default" "disabled" "empty" "enabled" "first"
-    "first-child" "first-of-type" "focus" "focus-within" "hover"
+    "first-child" "first-of-type" "focus" "focus-within" "has" "hover"
     "in-range" "indeterminate" "invalid" "lang" "last-child"
     "last-of-type" "left" "link" "not" "nth-child" "nth-last-child"
     "nth-last-of-type" "nth-of-type" "only-child" "only-of-type"
diff --git a/lisp/textmodes/enriched.el b/lisp/textmodes/enriched.el
index a269cae0c9b..c5ae2a15557 100644
--- a/lisp/textmodes/enriched.el
+++ b/lisp/textmodes/enriched.el
@@ -390,6 +390,16 @@ which can be the value of the `face' text property."
          (list (list "x-color" (cadr face))))
         ((and (listp face) (eq (car face) :background))
          (list (list "x-bg-color" (cadr face))))
+        ((and (listp face) (eq (car face) :underline))
+         (list (list "underline")))
+        ((and (listp face)
+              (eq (car face) :weight)
+              (eq (cadr face) 'bold))
+         (list (list "bold")))
+        ((and (listp face)
+              (eq (car face) :slant)
+              (memq (cadr face) '(italic oblique)))
+         (list (list "italic")))
         ((listp face)
          (apply #'append (mapcar #'enriched-face-ans face)))
         ((let* ((fg (face-attribute face :foreground))
diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index 9445b4a6b9a..c1ccdf2ec5f 100644
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -1700,7 +1700,7 @@ and URL `https://rhodesmill.org/brandon/2012/one-sentence-per-line/'."
         (to (copy-marker (max from to) t))
         pfx)
     (goto-char from)
-    (let ((fill-column (* 2 (point-max)))) ; Wide characters span up to two columns.
+    (let ((fill-column most-positive-fixnum))
       (setq pfx (or (save-excursion
                       (fill-region-as-paragraph-default (point)
                                                         to
diff --git a/lisp/textmodes/markdown-ts-mode.el b/lisp/textmodes/markdown-ts-mode.el
index cc3eaf03e15..657d6bc466d 100644
--- a/lisp/textmodes/markdown-ts-mode.el
+++ b/lisp/textmodes/markdown-ts-mode.el
@@ -40,6 +40,7 @@
 (require 'treesit)
 (require 'subr-x)
 (require 'outline)
+(require 'seq)
 
 (treesit-declare-unavailable-functions)
 
@@ -296,7 +297,12 @@ the same features enabled in MODE."
                   (plist-get configs :simple-indent)))
     (setq treesit-range-settings
           (append treesit-range-settings
-                  (plist-get configs :range)))
+                  ;; Filter out function queries, because they are
+                  ;; usually some hack and might escape the code block.
+                  ;; Case in point: c-ts-mode's range setting.
+                  (seq-filter (lambda (setting)
+                                (not (functionp (car setting))))
+                              (plist-get configs :range))))
     (setq-local indent-line-function #'treesit-indent)
     (setq-local indent-region-function #'treesit-indent-region)))