{when, if}-let* in lieu of unstarry onesHEADmaster

5 files changed, 17 insertions, 17 deletions

diff --git a/elisp/geiser-connection.el b/elisp/geiser-connection.el
index b59d109..414cc6b 100644
--- a/elisp/geiser-connection.el
+++ b/elisp/geiser-connection.el
@@ -160,7 +160,7 @@
     new))
 
 (defun geiser-con--has-entered-debugger (con answer)
-  (when-let ((p (car (last (split-string answer "\n" t)))))
+  (when-let* ((p (car (last (split-string answer "\n" t)))))
     (geiser-con--connection-update-debugging con p))
   (geiser-con--connection-is-debugging con))
 
@@ -272,7 +272,7 @@
 
 (defun geiser-con--interrupt (con)
   "Interrupt any request being currently in process."
-  (when-let (proc (and con (geiser-con--connection-process con)))
+  (when-let* ((proc (and con (geiser-con--connection-process con))))
     (when (process-live-p proc)
       (interrupt-process proc))))
 
diff --git a/elisp/geiser-doc.el b/elisp/geiser-doc.el
index 5d1d04b..36712b5 100644
--- a/elisp/geiser-doc.el
+++ b/elisp/geiser-doc.el
@@ -1,6 +1,6 @@
 ;;; geiser-doc.el --- Accessing scheme-provided documentation  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2016, 2021-2022, 2024 Jose Antonio Ortega Ruiz
+;; Copyright (C) 2009-2016, 2021-2022, 2024, 2026 Jose Antonio Ortega Ruiz
 
 ;; This program is free software; you can redistribute it and/or
 ;; modify it under the terms of the Modified BSD License. You should
@@ -185,9 +185,9 @@ value if the default action should be skipped.")
 (defun geiser-doc-goto-source (&rest _)
   "Go to the definition of this item."
   (interactive)
-  (when-let (link geiser-doc--buffer-link)
+  (when-let* ((link geiser-doc--buffer-link))
     (with--geiser-implementation (geiser-doc--link-impl link)
-      (if-let (target (geiser-doc--link-target link))
+      (if-let* ((target (geiser-doc--link-target link)))
           (geiser-edit-symbol target nil (point-marker))
         (geiser-edit-module (geiser-doc--link-module link))))))
 
@@ -200,7 +200,7 @@ value if the default action should be skipped.")
 (defun geiser-doc-goto-manual (&rest _)
   "Go to the manual for this item."
   (interactive)
-  (when-let (link geiser-doc--buffer-link)
+  (when-let* ((link geiser-doc--buffer-link))
     (let ((tm (geiser-doc--link-target link))
           (mod (geiser-doc--link-module link))
           (impl (geiser-doc--link-impl link)))
diff --git a/elisp/geiser-edit.el b/elisp/geiser-edit.el
index d08b570..1251969 100644
--- a/elisp/geiser-edit.el
+++ b/elisp/geiser-edit.el
@@ -1,6 +1,6 @@
 ;;; geiser-edit.el --- Scheme edit locations  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009, 2010, 2012, 2013, 2019-2025 Jose Antonio Ortega Ruiz
+;; Copyright (C) 2009, 2010, 2012, 2013, 2019-2026 Jose Antonio Ortega Ruiz
 
 ;; This program is free software; you can redistribute it and/or
 ;; modify it under the terms of the Modified BSD License. You should
@@ -60,7 +60,7 @@ or following links in error buffers.")
   (cdr (assoc "name" loc)))
 
 (defsubst geiser-edit--location-file (loc)
-  (when-let ((file-name (cdr (assoc "file" loc))))
+  (when-let* ((file-name (cdr (assoc "file" loc))))
     (concat (or (file-remote-p default-directory) "")
             file-name)))
 
@@ -140,7 +140,7 @@ or following links in error buffers.")
          (forward-line (max 0 (1- line))))
         ((numberp pos) (goto-char pos)))
   (if (not col)
-      (when-let (pos (car (geiser-edit--find-def symbol)))
+      (when-let* ((pos (car (geiser-edit--find-def symbol))))
         (goto-char pos))
     (beginning-of-line)
     (forward-char col)
diff --git a/elisp/geiser-repl.el b/elisp/geiser-repl.el
index 547971f..76dac80 100644
--- a/elisp/geiser-repl.el
+++ b/elisp/geiser-repl.el
@@ -56,7 +56,7 @@ used to discover a buffer's project."
 
 (defun geiser-repl-project-root ()
   "Use project.el, to determine a buffer's project root."
-  (when-let (p (project-current)) (project-root p)))
+  (when-let* ((p (project-current))) (project-root p)))
 
 (geiser-custom--defcustom geiser-repl-current-project-function
     #'geiser-repl-project-root
@@ -615,12 +615,12 @@ to standard output face."
 (defvar geiser-repl--last-scm-buffer)
 
 (defun geiser-repl--set-default-directory ()
-  (when-let (root (funcall geiser-repl-current-project-function))
+  (when-let* ((root (funcall geiser-repl-current-project-function)))
     (setq-local default-directory root)))
 
 (defun geiser-repl--set-up-load-path ()
   (when geiser-repl-add-project-paths
-    (when-let (root (funcall geiser-repl-current-project-function))
+    (when-let* ((root (funcall geiser-repl-current-project-function)))
       (dolist (p (cond ((eq t geiser-repl-add-project-paths) '("."))
                        ((listp geiser-repl-add-project-paths)
                         geiser-repl-add-project-paths)))
@@ -816,8 +816,8 @@ If SAVE-HISTORY is non-nil, save CMD in the REPL history."
       (when (buffer-live-p geiser-repl--connection-buffer)
         (kill-buffer geiser-repl--connection-buffer)
         (setq geiser-repl--connection-buffer nil)
-        (when-let (a (geiser-repl--connection-address
-                      geiser-impl--implementation))
+        (when-let* ((a (geiser-repl--connection-address
+                        geiser-impl--implementation)))
           (delete-file a))))
     (dolist (buffer (buffer-list))
       (when (buffer-live-p buffer)
@@ -1209,7 +1209,7 @@ over a Unix-domain socket."
   (or geiser-repl--arglist (geiser-repl--arglist impl)))
 
 (defun geiser-repl--call-in-repl (cmd)
-  (when-let (b (geiser-repl--repl/impl geiser-impl--implementation))
+  (when-let* ((b (geiser-repl--repl/impl geiser-impl--implementation)))
     (save-window-excursion
       (with-current-buffer b (funcall cmd)))))
 
diff --git a/elisp/geiser-syntax.el b/elisp/geiser-syntax.el
index 683d37e..1dc42cc 100644
--- a/elisp/geiser-syntax.el
+++ b/elisp/geiser-syntax.el
@@ -1,6 +1,6 @@
 ;;; geiser-syntax.el --- Utilities for parsing scheme syntax  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2016, 2019-2022 Jose Antonio Ortega Ruiz
+;; Copyright (C) 2009-2016, 2019-2022, 2026 Jose Antonio Ortega Ruiz
 
 ;; This program is free software; you can redistribute it and/or
 ;; modify it under the terms of the Modified BSD License. You should
@@ -194,7 +194,7 @@ implementation-specific entries for font-lock-keywords.")
 
 (defun geiser-syntax--read/ex-symbol ()  ;; #{foo bar}# style symbols
   (let ((tk (geiser-syntax--read/matching "{" "}")))
-    (when-let (c (geiser-syntax--read/next-char))
+    (when-let* ((c (geiser-syntax--read/next-char)))
       (when (char-equal ?\# c)
         (geiser-syntax--read/next-char)
         (cons 'atom (make-symbol (format "#{%s}#" tk)))))))