Merge from savannah/emacs-30

f4c0459ed3e Fix Tramp parser
47c79b62dd0 Checkdoc fixes in progmodes
6757f8e67d3 Checkdoc fixes in Org Mode
9fcee3c1d1e Clarify `checkdoc-max-keyref-before-warn` docstring
b249f022f12 * lisp/files.el (insert-directory): Quote switches in wil...
8911d53ce5d Fix uses of 'dired-omit-mode' (bug#71905)

1 files changed, 2 insertions, 2 deletions

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 73d6bdd2d2d..a00289d6de9 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -1140,8 +1140,8 @@ fontified."
 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
-identifier only if it matches against TYPE-REGEX. NODE is the
+highlight identifier nodes.  If TYPE-REGEX is not nil fontify type
+identifier only if it matches against TYPE-REGEX.  NODE is the
 binary_operator node.  OVERRIDE is the override flag described in
 `treesit-font-lock-rules'.  START and END mark the region to be
 fontified."