branch: externals/org
commit f49732d22e3a92bdde13b08e05aa596b52dc7ba8
Author: Ihor Radchenko <yanta...@posteo.net>
Commit: Ihor Radchenko <yanta...@posteo.net>
Fix Emacs 28 compatibility
* lisp/oc-basic.el (org-cite-basic--complete-key): Do not use
`seq-keep' that is not yet available.
* lisp/ol.el (org-link-preview--remove-overlay):
(org-link-preview-clear): Only use `imagep' when available.
---
lisp/oc-basic.el | 9 ++++++---
lisp/ol.el | 6 ++++--
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/lisp/oc-basic.el b/lisp/oc-basic.el
index e2b36c49a2..fb6d9477a8 100644
--- a/lisp/oc-basic.el
+++ b/lisp/oc-basic.el
@@ -979,9 +979,12 @@ Raise an error when no bibliography is set in the buffer."
'separator
repeated-sep)))))
(prompt (org-cite-basic--crm-indicate-prompt "Keys: ")))
- (seq-keep
- choice-to-citation
- (completing-read-multiple prompt table nil t))))
+ ;; FIXME: Use `seq-keep' after we drop Emacs 28 support.
+ (delq
+ nil
+ (seq-map
+ choice-to-citation
+ (completing-read-multiple prompt table nil t)))))
(t
(let* ((keys nil)
(build-prompt
diff --git a/lisp/ol.el b/lisp/ol.el
index 5a87f6e5dd..09802d358c 100644
--- a/lisp/ol.el
+++ b/lisp/ol.el
@@ -1020,7 +1020,9 @@ AFTER is true when this function is called post-change."
;; Clear image from cache to avoid image not updating upon
;; changing on disk. See Emacs bug#59902.
(when-let* ((disp (overlay-get ov 'display))
- ((imagep disp)))
+ ((if (fboundp 'imagep)
+ (imagep disp)
+ (eq 'image (car-safe disp)))))
(image-flush disp))
(delete-overlay ov)))
@@ -2136,7 +2138,7 @@ Previews are generated from the specs in
(setq org-link-preview--queue (delq spec org-link-preview--queue)))
;; Remove placed overlays between BEG and END
(when-let* ((image (overlay-get ov 'display)))
- (when (imagep image)
+ (when (if (fboundp 'imagep) (imagep image) (eq 'image (car-safe
image)))
(image-flush image)))
(setq org-link-preview-overlays (delq ov org-link-preview-overlays))
(delete-overlay ov)))
