[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
emacs-28 f928330fa8: Update to Org 9.5.3-6-gef41f3
From: |
Kyle Meyer |
Subject: |
emacs-28 f928330fa8: Update to Org 9.5.3-6-gef41f3 |
Date: |
Sun, 15 May 2022 17:59:01 -0400 (EDT) |
branch: emacs-28
commit f928330fa86e1493d2862180b132a99022458c96
Author: Kyle Meyer <kyle@kyleam.com>
Commit: Kyle Meyer <kyle@kyleam.com>
Update to Org 9.5.3-6-gef41f3
---
lisp/org/org-version.el | 2 +-
lisp/org/org.el | 7 ++++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/lisp/org/org-version.el b/lisp/org/org-version.el
index dc689662b7..6bafb6fc37 100644
--- a/lisp/org/org-version.el
+++ b/lisp/org/org-version.el
@@ -11,7 +11,7 @@ Inserted by installing Org mode or when a release is made."
(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.5.3-3-gd54104"))
+ (let ((org-git-version "release_9.5.3-6-gef41f3"))
org-git-version))
(provide 'org-version)
diff --git a/lisp/org/org.el b/lisp/org/org.el
index 1fc4251a34..6842bfe9b1 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -247,7 +247,7 @@ byte-compiled before it is loaded."
(if compile
(progn
(byte-compile-file tangled-file)
- (load tangled-file)
+ (load-file (byte-compile-dest-file tangled-file))
(message "Compiled and loaded %s" tangled-file))
(load-file tangled-file)
(message "Loaded %s" tangled-file))))
@@ -15026,8 +15026,9 @@ When matching, the match groups are the following:
(let* ((regexp
(if extended
(if (eq extended 'agenda)
- (rx (or (regexp org-ts-regexp3)
- (regexp org-element--timestamp-regexp)))
+ (rx-to-string
+ `(or (regexp ,org-ts-regexp3)
+ (regexp ,org-element--timestamp-regexp)))
org-ts-regexp3)
org-ts-regexp2))
(pos (point))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- emacs-28 f928330fa8: Update to Org 9.5.3-6-gef41f3,
Kyle Meyer <=