From 4308710de811e3b4e2fb47f9024439df03e96b90 Mon Sep 17 00:00:00 2001 From: jao Date: Thu, 7 Nov 2024 18:01:13 +0000 Subject: {if,when}-let deprecation in emacs 31 --- lib/eos/jao-afio.el | 4 ++-- lib/eos/jao-eshell-here.el | 6 +++--- lib/eos/jao-minibuffer.el | 4 ++-- lib/eos/jao-tracking.el | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'lib/eos') diff --git a/lib/eos/jao-afio.el b/lib/eos/jao-afio.el index b588989..a5d9b24 100644 --- a/lib/eos/jao-afio.el +++ b/lib/eos/jao-afio.el @@ -86,7 +86,7 @@ (if (car docs) (progn (switch-to-buffer (car docs)) (switch-to-buffer-other-window (or (cadr docs) (car docs)))) - (when-let (docs (jao-doc-session)) + (when-let* ((docs (jao-doc-session))) (when (y-or-n-p (format "Load saved session? (%d docs)" (length docs))) (jao-afio-open-pdf-session docs)))))) @@ -96,7 +96,7 @@ (declare-function jao-eww-session-load "jao-eww-session") (defun jao-afio--open-eww-session () - (if-let (b (jao-eww-session-eww-buffers)) + (if-let* ((b (jao-eww-session-eww-buffers))) (switch-to-buffer (car b)) (jao-eww-session-load))) diff --git a/lib/eos/jao-eshell-here.el b/lib/eos/jao-eshell-here.el index 54d58f0..ad7805f 100644 --- a/lib/eos/jao-eshell-here.el +++ b/lib/eos/jao-eshell-here.el @@ -1,6 +1,6 @@ ;;; jao-eshell-here.el --- Easy opening of eshell buffers -*- lexical-binding: t; -*- -;; Copyright (C) 2021, 2023 jao +;; Copyright (C) 2021, 2023, 2024 jao ;; Author: jao ;; Keywords: eshell @@ -33,8 +33,8 @@ "Value to use for `display-buffer-alist' when displaying the eshell buffer.") (defun jao-eshell-here--find-window (b) - (when-let (w (seq-find (lambda (w) (eq (window-buffer w) b)) - (window-list))) + (when-let* ((w (seq-find (lambda (w) (eq (window-buffer w) b)) + (window-list)))) (select-window w))) (defun jao-eshell-here--frame-buffer (&optional b) diff --git a/lib/eos/jao-minibuffer.el b/lib/eos/jao-minibuffer.el index 77bd49a..d2bc70a 100644 --- a/lib/eos/jao-minibuffer.el +++ b/lib/eos/jao-minibuffer.el @@ -69,12 +69,12 @@ (insert msg))) (defun jao-minibuffer--strip-prev (msg) - (if-let ((n (text-property-any 0 (length msg) 'minibuffer-message t msg))) + (if-let* ((n (text-property-any 0 (length msg) 'minibuffer-message t msg))) (string-trim (substring msg 0 n)) msg)) (defun jao-minibuffer--prefix (msgs) - (when-let (p (string-join (butlast msgs) "\n")) + (when-let* ((p (string-join (butlast msgs) "\n"))) (unless (string-blank-p p) (concat p "\n")))) (defun jao-minibuffer--format-msg (msg) diff --git a/lib/eos/jao-tracking.el b/lib/eos/jao-tracking.el index 2af868c..a1fff73 100644 --- a/lib/eos/jao-tracking.el +++ b/lib/eos/jao-tracking.el @@ -105,7 +105,7 @@ `(:propertize ,(plist-get s :propertize) face (jao-tracking-minibuffer - ,@(when-let ((f (plist-get s 'face))) + ,@(when-let* ((f (plist-get s 'face))) (jao-tracking-set-log " * ") (list f)))) `(:propertize "|" face jao-tracking-minibuffer-sep))) -- cgit v1.2.3