branch: externals/popper commit 49f4904480cf4ca5c6db83fcfa9e6ea8d4567d96 Author: Karthik Chikmagalur <karthikchikmaga...@gmail.com> Commit: Karthik Chikmagalur <karthikchikmaga...@gmail.com>
popper: Linting if-let -> if-let* when-let -> when-let* * popper.el (popper--suppress-popups, popper-raise-popup, popper-group-by-project, popper-group-by-directory) * popper-echo.el (popper-echo, popper-echo--dispatch-toggle) --- popper-echo.el | 6 +++--- popper.el | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/popper-echo.el b/popper-echo.el index 6fbbc41b65..bf875f7081 100644 --- a/popper-echo.el +++ b/popper-echo.el @@ -135,7 +135,7 @@ This is used to create functions for switching between popups quickly." (lambda (&optional arg) (interactive "P") - (when-let ((buf (nth i buf-list))) + (when-let* ((buf (nth i buf-list))) (unless arg (popper-close-latest)) (display-buffer buf) (popper--update-popups) @@ -217,7 +217,7 @@ Each command in the keymap calls the function REPEAT afterwards." (popup-strings (apply #'concat (cons - (if-let ((transform popper-echo-transform-function)) + (if-let* ((transform popper-echo-transform-function)) (funcall transform open-popup) (propertize open-popup 'face 'popper-echo-area)) (cl-mapcar (lambda (key buf) @@ -231,7 +231,7 @@ Each command in the keymap calls the function REPEAT afterwards." key) 'face 'popper-echo-dispatch-hint) (propertize ":" 'face 'popper-echo-area-buried))) - (if-let ((transform popper-echo-transform-function)) + (if-let* ((transform popper-echo-transform-function)) (funcall transform buf) (concat (propertize buf 'face 'popper-echo-area-buried))) diff --git a/popper.el b/popper.el index 42a6fdf3ec..201a6cad3c 100644 --- a/popper.el +++ b/popper.el @@ -311,7 +311,7 @@ This is intended to be used in `display-buffer-alist'." The project root is used if found by project, with the default directory as a fall back." (or (and (fboundp 'project-root) - (when-let ((project (project-current))) + (when-let* ((project (project-current))) (project-root project))) (expand-file-name default-directory))) @@ -321,7 +321,7 @@ directory as a fall back." (user-error "Cannot find project directory to group popups. \ Please install `project' or customize \ `popper-group-function'")) - (when-let ((project (project-current))) + (when-let* ((project (project-current))) (project-root project))) (defun popper-group-by-projectile () @@ -583,7 +583,7 @@ See `popper-cycle' for NUM and details." (defun popper-raise-popup (&optional buffer) "Raise a popup to regular status. If BUFFER is not specified,raise the current buffer." - (when-let ((buf (get-buffer (or buffer (current-buffer))))) + (when-let* ((buf (get-buffer (or buffer (current-buffer))))) (with-current-buffer buf (if (popper-popup-p buf) (setq popper-popup-status 'raised) @@ -647,7 +647,7 @@ This should run after `popper--update-popups' in (with-selected-window win (setq-local popper-popup-status 'popup) ;; If window was previously showing a different buffer, switch to it - (if-let ((wpb (window-prev-buffers win)) + (if-let* ((wpb (window-prev-buffers win)) (switch-to-buffer-preserve-window-point t)) (switch-to-buffer (caar wpb)) ;; otherwise kill this window/frame