diff options
| author | Kyle Meyer <kyle@kyleam.com> | 2023-03-26 17:01:14 -0400 |
|---|---|---|
| committer | Kyle Meyer <kyle@kyleam.com> | 2023-03-26 17:01:30 -0400 |
| commit | a8c23677d3939b8af1bcddb63244fe7b5bb384a4 (patch) | |
| tree | e29f125ec41eade590d01b45efe10ea3a7ee90f7 | |
| parent | 45b16bfb496025d9f21f7cdccb6a25a0be83a26f (diff) | |
| download | emacs-a8c23677d39.tar.gz | |
Update to Org 9.6.2
| -rw-r--r-- | etc/refcards/orgcard.tex | 2 | ||||
| -rw-r--r-- | lisp/org/org-version.el | 4 | ||||
| -rw-r--r-- | lisp/org/org.el | 2 | ||||
| -rw-r--r-- | lisp/org/ox-texinfo.el | 11 |
4 files changed, 11 insertions, 8 deletions
diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex index dc222719b7e..0ef05353341 100644 --- 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 20636a3dd04..fd75f4785d6 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.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)) (provide 'org-version) diff --git a/lisp/org/org.el b/lisp/org/org.el index 2fbb825015f..1649722ab0c 100644 --- 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 4ff482cc3f5..f822f3d110c 100644 --- 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) |