Update to Org 9.7.10

(cherry picked from commit 023d387a7bd41298a5c294ce163a49ba55b31ef5)

diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex
index b112e957d1d5437b87ccc74f38cd5d06a48e8142..65e9caa26d2f99ce3c8eb8d46e2b3ceb8ed8644f 100644 (file)
--- a/etc/refcards/orgcard.tex
+++ b/etc/refcards/orgcard.tex
@@ -1,5 +1,5 @@
 % Reference Card for Org Mode
-\def\orgversionnumber{9.7.9}
+\def\orgversionnumber{9.7.10}
 \def\versionyear{2024}          % latest update
 \input emacsver.tex
 

diff --git a/lisp/org/org-persist.el b/lisp/org/org-persist.el
index 8b0d9b110f90a10f2017643f068ab1b89ba772a6..7fa836d0d7a6bbadf8077fe89fd82f15dba2d915 100644 (file)
--- a/lisp/org/org-persist.el
+++ b/lisp/org/org-persist.el
@@ -448,6 +448,8 @@ FORMAT and ARGS are passed to `message'."
                  buffer-or-file (error-message-string err)))
          nil)))))
 
+;; FIXME: `pp' is very slow when writing even moderately large datasets
+;; We should probably drop it or find some fast formatter.
 (defun org-persist--write-elisp-file (file data &optional no-circular pp)
   "Write elisp DATA to FILE."
   ;; Fsync slightly reduces the chance of an incomplete filesystem
@@ -898,7 +900,7 @@ Otherwise, return t."
     (let ((index-file
            (org-file-name-concat org-persist-directory org-persist-index-file)))
       (org-persist--merge-index-with-disk)
-      (org-persist--write-elisp-file index-file org-persist--index t t)
+      (org-persist--write-elisp-file index-file org-persist--index t)
       (setq org-persist--index-age
             (file-attribute-modification-time (file-attributes index-file)))
       index-file)))

diff --git a/lisp/org/org-version.el b/lisp/org/org-version.el
index d5a434e805d3f6a7643e3169683d7961bec1f417..989fadf69fa03b42382f6c74bac9ff00522b4deb 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.7.9"))
+   (let ((org-release "9.7.10"))
      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.7.9"))
+   (let ((org-git-version "release_9.7.10"))
      org-git-version))
 \f
 (provide 'org-version)

diff --git a/lisp/org/org.el b/lisp/org/org.el
index 2f2412511e9cfecff2841e8e4f172889ceeec5f7..9618077e688e84c63c93e2f3d4bfad0067acc49d 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.7.9
+;; Version: 9.7.10
 
 ;; This file is part of GNU Emacs.
 ;;

diff --git a/lisp/org/ox-html.el b/lisp/org/ox-html.el
index d1687cf5a808665c131c7d46cb32361a1423db1a..446698758c453e4eda4a2c027c00cb486bae85a2 100644 (file)
--- a/lisp/org/ox-html.el
+++ b/lisp/org/ox-html.el
@@ -2351,7 +2351,7 @@ is the language used for CODE, as a string, or nil."
      ((not (progn (require 'htmlize nil t)
                (fboundp 'htmlize-region-for-paste)))
       ;; Emit a warning.
-      (warn "Cannot fontify source block (htmlize.el >= 1.34 required)")
+      (warn "Cannot fontify source block (htmlize.el >= 1.34 required).  Falling back to plain text.  (see `org-html-htmlize-output-type')")
       (org-html-encode-plain-text code))
      (t
       ;; Map language

diff --git a/lisp/org/ox.el b/lisp/org/ox.el
index 75839e6c88a01b6fe156abdc88c2d7b1688a174d..1024bdc4baea11728a3f1d4a779569d7011ec97d 100644 (file)
--- a/lisp/org/ox.el
+++ b/lisp/org/ox.el
@@ -81,6 +81,7 @@
 (require 'ol)
 (require 'org-element)
 (require 'org-macro)
+(require 'org-attach) ; org-attach adds staff to `org-export-before-parsing-functions'
 (require 'tabulated-list)
 
 (declare-function org-src-coderef-format "org-src" (&optional element))