diff options
| author | Kyle Meyer <kyle@kyleam.com> | 2022-12-10 16:59:46 -0500 |
|---|---|---|
| committer | Kyle Meyer <kyle@kyleam.com> | 2022-12-10 16:59:46 -0500 |
| commit | 01154166057e7cf289318a8cfa4d43716f26ca20 (patch) | |
| tree | 79dcc7b1c12e53ae852ae556541931fdd1a7ae66 /lisp/org/org.el | |
| parent | 26a8644a58768281bae249121f4f18d7b0661c44 (diff) | |
| download | emacs-01154166057e7cf289318a8cfa4d43716f26ca20.tar.gz emacs-01154166057e7cf289318a8cfa4d43716f26ca20.tar.bz2 emacs-01154166057e7cf289318a8cfa4d43716f26ca20.zip | |
Update to Org 9.6-31-g954a95
Diffstat (limited to 'lisp/org/org.el')
| -rw-r--r-- | lisp/org/org.el | 6 |
1 files changed, 5 insertions, 1 deletions
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) |