From ca33663e5065fb9730924650ea9e86f486910fb3 Mon Sep 17 00:00:00 2001
From: Kyle Meyer <kyle@kyleam.com>
Date: Sun, 12 Apr 2026 16:44:03 -0400
Subject: [PATCH] Update to Org 9.8.2

---
 etc/refcards/orgcard.tex |  2 +-
 lisp/org/org-element.el  |  4 ++--
 lisp/org/org-version.el  |  4 ++--
 lisp/org/org.el          |  2 +-
 lisp/org/ox-texinfo.el   | 14 ++++++++------
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex
index 73d7543e853..88444fef54e 100644
--- a/etc/refcards/orgcard.tex
+++ b/etc/refcards/orgcard.tex
@@ -1,5 +1,5 @@
 % Reference Card for Org Mode
-\def\orgversionnumber{9.8.1}
+\def\orgversionnumber{9.8.2}
 \def\versionyear{2026}          % latest update
 \input emacsver.tex
 
diff --git a/lisp/org/org-element.el b/lisp/org/org-element.el
index 5f64cc1c1d0..32edc154132 100644
--- a/lisp/org/org-element.el
+++ b/lisp/org/org-element.el
@@ -183,7 +183,7 @@ Drawer's name is located in match group 1.")
 (defconst org-element-dynamic-block-open-re
   (rx line-start (0+ (any ?\s ?\t))
       "#+BEGIN:" (0+ (any ?\s ?\t))
-      (group (1+ word))
+      (group (1+ (not space)))
       (opt
        (1+ (any ?\s ?\t))
        (group (1+ nonl))))
@@ -193,7 +193,7 @@ Parameters are in match group 2.")
 
 (defconst org-element-dynamic-block-open-re-nogroup
   (rx line-start (0+ (any ?\s ?\t))
-      "#+BEGIN:" (0+ (any ?\s ?\t)) word)
+      "#+BEGIN:" (0+ (any ?\s ?\t)) (not space))
   "Regexp matching the opening line of a dynamic block.")
 
 (defconst org-element-headline-re
diff --git a/lisp/org/org-version.el b/lisp/org/org-version.el
index a62f9544fc2..75d036844d8 100644
--- a/lisp/org/org-version.el
+++ b/lisp/org/org-version.el
@@ -5,13 +5,13 @@
 (defun org-release ()
   "The release version of Org.
 Inserted by installing Org mode or when a release is made."
-   (let ((org-release "9.8.1"))
+   (let ((org-release "9.8.2"))
      org-release))
 ;;;###autoload
 (defun org-git-version ()
   "The Git version of Org mode.
 Inserted by installing Org or when a release is made."
-   (let ((org-git-version "release_9.8.1"))
+   (let ((org-git-version "release_9.8.2"))
      org-git-version))
 
 (provide 'org-version)
diff --git a/lisp/org/org.el b/lisp/org/org.el
index d711687f4c9..bf3bfbc6244 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -9,7 +9,7 @@
 ;; URL: https://orgmode.org
 ;; Package-Requires: ((emacs "28.2"))
 
-;; Version: 9.8.1
+;; Version: 9.8.2
 
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org/ox-texinfo.el b/lisp/org/ox-texinfo.el
index a5417773854..0aaa4902bd7 100644
--- a/lisp/org/ox-texinfo.el
+++ b/lisp/org/ox-texinfo.el
@@ -573,12 +573,14 @@ Trim string and collapse multiple whitespace characters as they
 are not significant.  Replace leading left parenthesis, when
 followed by a right parenthesis, with a square bracket.  Remove
 periods, commas and colons."
-  (org-trim
-   (replace-regexp-in-string
-    "[ \t]+" " "
-    (replace-regexp-in-string
-     "[:,.]" ""
-     (replace-regexp-in-string "\\`(\\(.*?)\\)" "[\\1" title)))))
+  (thread-last
+    title
+    (replace-regexp-in-string "\\`(\\(.*?)\\)" "[\\1")
+    ;; See https://lists.gnu.org/archive/html/bug-texinfo/2026-03/msg00000.html
+    (replace-regexp-in-string (rx "@comma" (optional "{}")) "")
+    (replace-regexp-in-string "[:,.]" "")
+    (replace-regexp-in-string "[ \t]+" " ")
+    org-trim))
 
 (defun org-texinfo--sanitize-title (title info)
   "Make TITLE suitable as a section name.