diff options
| author | Stefan Kangas <stefan@marxist.se> | 2022-05-16 06:30:38 +0200 |
|---|---|---|
| committer | Stefan Kangas <stefan@marxist.se> | 2022-05-16 06:30:38 +0200 |
| commit | 1fc1d8b88994303ac7c1aac673cb3fead5ff4d9e (patch) | |
| tree | 1f1b187a70550cdb54492d7e8e3ce1c1832a64f4 /lisp/org | |
| parent | 0651bc6d175ddb863855fddd056ca623c5900c20 (diff) | |
| parent | f928330fa86e1493d2862180b132a99022458c96 (diff) | |
| download | emacs-1fc1d8b88994303ac7c1aac673cb3fead5ff4d9e.tar.gz emacs-1fc1d8b88994303ac7c1aac673cb3fead5ff4d9e.tar.bz2 emacs-1fc1d8b88994303ac7c1aac673cb3fead5ff4d9e.zip | |
Merge from origin/emacs-28
f928330fa8 Update to Org 9.5.3-6-gef41f3
007bf9a34c Hide temporary FUSE files in Tramp
5dbaddc729 ; Fix some typos
Diffstat (limited to 'lisp/org')
| -rw-r--r-- | lisp/org/org-version.el | 2 | ||||
| -rw-r--r-- | 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 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 778f06aa64f..8294e577321 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)) |