tec/org-mode
tec
/
org-mode
forked from mirrors/org-mode
1
0
Fork 0
Code Pull Requests Releases Activity

Merge branch 'bugfix' into emacs-sync

This commit is contained in:
Kyle Meyer 2022-05-15 17:34:22 -04:00
parent 1264ccc5f9 ef41f385fb
commit fd679428e4
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lisp/org.el
View File

@ -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))