Update to Org 9.6.2

diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex
index dc222719b7ed46edb5eae7daa9ea6de3bad3f7d3..0ef0535334188569f9e5ea0f3c3c1ea660fcffe2 100644 (file)
--- a/etc/refcards/orgcard.tex
+++ b/etc/refcards/orgcard.tex
@@ -1,5 +1,5 @@
 % Reference Card for Org Mode
-\def\orgversionnumber{9.6.1}
+\def\orgversionnumber{9.6.2}
 \def\versionyear{2023}          % latest update
 \input emacsver.tex
 

diff --git a/lisp/org/org-version.el b/lisp/org/org-version.el
index 20636a3dd04e617f9331cad2735431ef04dcf819..fd75f4785d6414cd949884e10fbf4781642e185c 100644 (file)
--- 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.6.1"))
+   (let ((org-release "9.6.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.6.1-48-g92471e"))
+   (let ((org-git-version "release_9.6.2"))
      org-git-version))
 \f
 (provide 'org-version)

diff --git a/lisp/org/org.el b/lisp/org/org.el
index 2fbb825015fa165c466fc8e44d0b88fcb99018e7..1649722ab0c29538f6ef3a01753ec6123dcdbd33 100644 (file)
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -9,7 +9,7 @@
 ;; URL: https://orgmode.org
 ;; Package-Requires: ((emacs "26.1"))
 
-;; Version: 9.6.1
+;; Version: 9.6.2
 
 ;; This file is part of GNU Emacs.
 ;;

diff --git a/lisp/org/ox-texinfo.el b/lisp/org/ox-texinfo.el
index 4ff482cc3f54f135162318339d9c9c7fae736ea2..f822f3d110cad550a632c008a3c4016c4364c0f0 100644 (file)
--- a/lisp/org/ox-texinfo.el
+++ b/lisp/org/ox-texinfo.el
@@ -2037,10 +2037,13 @@ Once computed, the results remain cached."
                                    "\n")))
               (with-temp-file input-file
                 (insert input-content))
-              (let* ((output-file (org-texinfo-compile input-file))
-                     (output-content (with-temp-buffer
-                                       (insert-file-contents output-file)
-                                       (buffer-string))))
+              (when-let* ((output-file
+                           ;; If compilation fails, consider math to
+                           ;; be not supported.
+                           (ignore-errors (org-texinfo-compile input-file)))
+                          (output-content (with-temp-buffer
+                                            (insert-file-contents output-file)
+                                            (buffer-string))))
                 (let ((result (string-match-p (regexp-quote math-example)
                                               output-content)))
                   (delete-file input-file)