branch: externals/org
commit e8edb90183fb906399673b993e76ec58e9a80400
Author: Marco Wahl <marcowahls...@gmail.com>
Commit: Marco Wahl <marcowahls...@gmail.com>
Fix complaints at compile
Replace when-let with when-let* at a few places.
---
lisp/ol.el | 12 ++++++------
lisp/org-datetree.el | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/lisp/ol.el b/lisp/ol.el
index 55c0dadfbe..e5b574e479 100644
--- a/lisp/ol.el
+++ b/lisp/ol.el
@@ -1975,7 +1975,7 @@ also use `org-link-preview-region'."
(and (equal arg '(4)) 'remove)))
;; C-u argument: clear image at point or in entry
((equal arg '(4))
- (if-let ((ov (cdr (get-char-property-and-overlay
+ (if-let* ((ov (cdr (get-char-property-and-overlay
(point) 'org-image-overlay))))
;; clear link preview at point
(funcall toggle-previews
@@ -2121,13 +2121,13 @@ Previews are generated from the specs in
(dolist (ov overlays)
(when (memq ov org-link-preview-overlays)
;; Remove pending preview tasks between BEG and END
- (when-let ((spec (cl-find ov org-link-preview--queue
- :key #'cadr)))
+ (when-let* ((spec (cl-find ov org-link-preview--queue
+ :key #'cadr)))
(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))
- ((imagep image)))
- (image-flush image))
+ (when-let* ((image (overlay-get ov 'display)))
+ (when (imagep image)
+ (image-flush image)))
(setq org-link-preview-overlays (delq ov org-link-preview-overlays))
(delete-overlay ov)))
;; Clear removed overlays.
diff --git a/lisp/org-datetree.el b/lisp/org-datetree.el
index 4bb605b9de..16967a301f 100644
--- a/lisp/org-datetree.el
+++ b/lisp/org-datetree.el
@@ -103,7 +103,7 @@ the tree will be built under the headline at point.
If `org-datetree-add-timestamp' is non-nil and TIME-GROUPING
includes `day' and a new entry is created, adds a time stamp
after the new headline."
- (when-let ((setdiff (seq-difference time-grouping
+ (when-let* ((setdiff (seq-difference time-grouping
'(year quarter month week day))))
(error (format "Unrecognized datetree grouping elements %s" setdiff)))
(let* ((year (calendar-extract-year d))
