procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to Org 9.6.2

Browse source
This commit is contained in:
Kyle Meyer 2023-03-26 17:01:14 -04:00
parent 45b16bfb49
commit a8c23677d3
4 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
etc/refcards/orgcard.tex
View file

@ -1,5 +1,5 @@
% Reference Card for Org Mode % Reference Card for Org Mode
\def\orgversionnumber{9.6.1} \def\orgversionnumber{9.6.2}
\def\versionyear{2023} % latest update \def\versionyear{2023} % latest update
\input emacsver.tex \input emacsver.tex

4
lisp/org/org-version.el
View file

@ -5,13 +5,13 @@
(defun org-release () (defun org-release ()
"The release version of Org. "The release version of Org.
Inserted by installing Org mode or when a release is made." 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)) org-release))
;;;###autoload ;;;###autoload
(defun org-git-version () (defun org-git-version ()
"The Git version of Org mode. "The Git version of Org mode.
Inserted by installing Org or when a release is made." 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)) org-git-version))
(provide 'org-version) (provide 'org-version)

2
lisp/org/org.el
View file

@ -9,7 +9,7 @@
;; URL: https://orgmode.org ;; URL: https://orgmode.org
;; Package-Requires: ((emacs "26.1")) ;; Package-Requires: ((emacs "26.1"))
;; Version: 9.6.1 ;; Version: 9.6.2
;; This file is part of GNU Emacs. ;; This file is part of GNU Emacs.
;; ;;

11
lisp/org/ox-texinfo.el
View file

@ -2037,10 +2037,13 @@ Once computed, the results remain cached."
"\n"))) "\n")))
(with-temp-file input-file (with-temp-file input-file
(insert input-content)) (insert input-content))
(let* ((output-file (org-texinfo-compile input-file)) (when-let* ((output-file
(output-content (with-temp-buffer ;; If compilation fails, consider math to
(insert-file-contents output-file) ;; be not supported.
(buffer-string)))) (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) (let ((result (string-match-p (regexp-quote math-example)
output-content))) output-content)))
(delete-file input-file) (delete-file input-file)