From 01154166057e7cf289318a8cfa4d43716f26ca20 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Sat, 10 Dec 2022 16:59:46 -0500 Subject: Update to Org 9.6-31-g954a95 --- lisp/org/org.el | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'lisp/org/org.el') diff --git a/lisp/org/org.el b/lisp/org/org.el index ab6212daccd..19f94c5e232 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el @@ -11380,7 +11380,7 @@ See also `org-scan-tags'." (pv (match-string 7 term)) (regexp (eq (string-to-char pv) ?{)) (strp (eq (string-to-char pv) ?\")) - (timep (string-match-p "^\"[[<][0-9]+.*[]>]\"$" pv)) + (timep (string-match-p "^\"[[<]\\(?:[0-9]+\\|now\\|today\\|tomorrow\\|[+-][0-9]+[dmwy]\\).*[]>]\"$" pv)) (po (org-op-to-function (match-string 6 term) (if timep 'time strp)))) (setq pv (if (or regexp strp) (substring pv 1 -1) pv)) @@ -16322,6 +16322,10 @@ buffer boundaries with possible narrowing." (org-element-property :end link)) (skip-chars-backward " \t") (point))))) + ;; FIXME: See bug#59902. We cannot rely + ;; on Emacs to update image if the file + ;; has changed. + (image-flush image) (overlay-put ov 'display image) (overlay-put ov 'face 'default) (overlay-put ov 'org-image-overlay t) -- cgit v1.2.3