emacs 31main

7 files changed, 16 insertions, 14 deletions

diff --git a/lib/eos/jao-afio.el b/lib/eos/jao-afio.el
index 72461dd..525cf60 100644
--- a/lib/eos/jao-afio.el
+++ b/lib/eos/jao-afio.el
@@ -19,6 +19,7 @@
 ;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; initialisation
+(require 'multisession)
 (require 'cl-lib)
 (require 'jao-doc-session)
 
@@ -126,7 +127,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))))))
 
@@ -136,7 +137,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..870e639 100644
--- a/lib/eos/jao-eshell-here.el
+++ b/lib/eos/jao-eshell-here.el
@@ -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 552e183..8f8996e 100644
--- a/lib/eos/jao-minibuffer.el
+++ b/lib/eos/jao-minibuffer.el
@@ -1,6 +1,6 @@
 ;;; jao-minibuffer.el --- using the minibuffer to report status  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2020, 2021, 2022, 2024, 2025  jao
+;; Copyright (C) 2020, 2021, 2022, 2024, 2025, 2026  jao
 
 ;; Author: jao <mail@jao.io>
 ;; Keywords: extensions
@@ -71,7 +71,7 @@
     (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))
 
diff --git a/lib/eos/jao-multisession.el b/lib/eos/jao-multisession.el
index 8660611..5583fb6 100644
--- a/lib/eos/jao-multisession.el
+++ b/lib/eos/jao-multisession.el
@@ -1,6 +1,6 @@
 ;;; multisession.el --- Multisession storage for variables  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2021-2025 Free Software Foundation, Inc.
+;; Copyright (C) 2021-2026 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
@@ -294,8 +294,8 @@ storage method to list."
     (tabulated-list-print t)
     (goto-char (point-min))
     (when id
-      (when-let ((match
-                  (text-property-search-forward 'tabulated-list-id id t)))
+      (when-let* ((match
+                   (text-property-search-forward 'tabulated-list-id id t)))
         (goto-char (prop-match-beginning match))))))
 
 (defun multisession-delete-value (id)
diff --git a/lib/eos/jao-notify.el b/lib/eos/jao-notify.el
index 8389b3a..941be36 100644
--- a/lib/eos/jao-notify.el
+++ b/lib/eos/jao-notify.el
@@ -1,6 +1,6 @@
-;; jao-notify.el -- Interacting with notification daemon
+;; jao-notify.el -- Interacting with notification daemon  -*- lexical-binding: t; -*-
 
-;; Copyright (c) 2017, 2019, 2020, 2021, 2024, 2025 Jose Antonio Ortega Ruiz
+;; Copyright (c) 2017, 2019, 2020, 2021, 2024, 2025, 2026 Jose Antonio Ortega Ruiz
 
 ;; Author: Jose Antonio Ortega Ruiz <jao@gnu.org>
 ;; Start date: Sun Jan 08, 2017 20:24
diff --git a/lib/eos/jao-r2e.el b/lib/eos/jao-r2e.el
index 568b8bc..81bbed6 100644
--- a/lib/eos/jao-r2e.el
+++ b/lib/eos/jao-r2e.el
@@ -1,6 +1,6 @@
 ;;; jao-r2e.el --- List of rss2email subscriptions   -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2025  Jose Antonio Ortega Ruiz
+;; Copyright (C) 2025, 2026  Jose Antonio Ortega Ruiz
 
 ;; Author: Jose Antonio Ortega Ruiz <mail@jao.io>
 ;; Keywords: news
@@ -18,6 +18,7 @@
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
+(require 'multisession)
 (require 'jao-url)
 
 (autoload 'View-quit "view")
diff --git a/lib/eos/jao-tracking.el b/lib/eos/jao-tracking.el
index 2af868c..280e9fb 100644
--- a/lib/eos/jao-tracking.el
+++ b/lib/eos/jao-tracking.el
@@ -1,6 +1,6 @@
 ;; jao-minibuffer-tracking.el --- Tracking notifications -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2021, 2022, 2024  jao
+;; Copyright (C) 2021, 2022, 2024, 2026  jao
 
 ;; Author: jao <mail@jao.io>
 ;; Keywords: convenience
@@ -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)))