From: Kyle Meyer <kyle@kyleam.com>
Date: Sun, 15 May 2022 21:49:17 +0000 (-0400)
Subject: Update to Org 9.5.3-6-gef41f3
X-Git-Tag: emacs-28.1.90~83
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f928330fa8;p=emacs.git

Update to Org 9.5.3-6-gef41f3
---

diff --git a/lisp/org/org-version.el b/lisp/org/org-version.el
index dc689662b7d..6bafb6fc378 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 1fc4251a340..6842bfe9b10 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))