Merge from origin/emacs-29

99efe5c80f9 Fix count of no-op functions (bug#68375)
0c01f97b73c Wrap @pxref of Abbrevs in parentheses (bug#68375)
70a09325d65 ; Fix last change in widget.texi
63411709a8d ; Fix typos
824cf54951c ; * etc/TODO: Add item to make play-sound non-blocking.
4fadbfe300a Add examples to the Widget manual
1bbb610821e Implement missing functions for custom-icon widget
29af214a75a Fix fontification of cgroup2 in fstab (bug#68367)

1 files changed, 2 insertions, 2 deletions

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index a44d4215d7c..e2f614f52c2 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -1117,7 +1117,7 @@ fontified."
 
 (defun python--treesit-fontify-union-types (node override start end &optional type-regex &rest _)
   "Fontify nested union types in the type hints.
-For examlpe, Lvl1 | Lvl2[Lvl3[Lvl4[Lvl5 | None]], Lvl2].  This
+For example, Lvl1 | Lvl2[Lvl3[Lvl4[Lvl5 | None]], Lvl2].  This
 structure is represented via nesting binary_operator and
 subscript nodes.  This function iterates over all levels and
 highlight identifier nodes. If TYPE-REGEX is not nil fontify type
@@ -1275,7 +1275,7 @@ fontified."
                       (subscript (identifier) @font-lock-type-face)
                       (subscript (attribute attribute: (identifier) @font-lock-type-face))]))
 
-     ;; Patern matching: case [str(), pack0.Type0()].  Take only the
+     ;; Pattern matching: case [str(), pack0.Type0()].  Take only the
      ;; last identifier.
      (class_pattern (dotted_name (identifier) @font-lock-type-face :anchor))