From 50ac28910a2827c13519bdd21010f506237cb9a0 Mon Sep 17 00:00:00 2001 From: Nathaniel Nicandro Date: Fri, 16 Nov 2018 04:59:09 -0600 Subject: [PATCH] Remove usage of deprecated `when-let` This was deprecated in Emacs 26.1 --- jupyter-client.el | 2 +- jupyter-messages.el | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jupyter-client.el b/jupyter-client.el index 700bf30..28e28b8 100644 --- a/jupyter-client.el +++ b/jupyter-client.el @@ -573,7 +573,7 @@ necessary." (defun jupyter--run-callbacks (req msg) "Run REQ's MSG callbacks. See `jupyter-add-callback'." - (when-let ((callbacks (and req (jupyter-request-callbacks req)))) + (when-let* ((callbacks (and req (jupyter-request-callbacks req)))) ;; Callback for all message types (funcall (alist-get t callbacks #'identity) msg) (funcall (alist-get (jupyter-message-type msg) callbacks #'identity) msg))) diff --git a/jupyter-messages.el b/jupyter-messages.el index 21514f9..f2ce26d 100644 --- a/jupyter-messages.el +++ b/jupyter-messages.el @@ -178,8 +178,8 @@ decoded string." ;; string (json-unknown-keyword str)))) (prog1 val - (when-let ((msg-type (and (listp val) - (plist-get val :msg_type)))) + (when-let* ((msg-type (and (listp val) + (plist-get val :msg_type)))) (plist-put val :msg_type (jupyter-message-type-as-keyword msg-type)))))))