[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
emacs-30 023d387a7bd: Update to Org 9.7.10
From: |
Kyle Meyer |
Subject: |
emacs-30 023d387a7bd: Update to Org 9.7.10 |
Date: |
Sun, 18 Aug 2024 21:10:33 -0400 (EDT) |
branch: emacs-30
commit 023d387a7bd41298a5c294ce163a49ba55b31ef5
Author: Kyle Meyer <kyle@kyleam.com>
Commit: Kyle Meyer <kyle@kyleam.com>
Update to Org 9.7.10
---
etc/refcards/orgcard.tex | 2 +-
lisp/org/org-persist.el | 4 +++-
lisp/org/org-version.el | 4 ++--
lisp/org/org.el | 2 +-
lisp/org/ox-html.el | 2 +-
lisp/org/ox.el | 1 +
6 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex
index b112e957d1d..65e9caa26d2 100644
--- 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 8b0d9b110f9..7fa836d0d7a 100644
--- 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 d5a434e805d..989fadf69fa 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.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))
(provide 'org-version)
diff --git a/lisp/org/org.el b/lisp/org/org.el
index 0b3566121d9..26812bbfb29 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.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 d1687cf5a80..446698758c4 100644
--- 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 75839e6c88a..1024bdc4bae 100644
--- 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))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- emacs-30 023d387a7bd: Update to Org 9.7.10,
Kyle Meyer <=