1 files changed, 27 insertions, 4 deletions
diff --git a/tests/test-ui-navigation-split-follow-undo-kill.el b/tests/test-ui-navigation-split-follow-undo-kill.el
index 8e3900743..35ed7a020 100644
--- a/tests/test-ui-navigation-split-follow-undo-kill.el
+++ b/tests/test-ui-navigation-split-follow-undo-kill.el
@@ -70,7 +70,30 @@ non-visited entry, not the second."
                            (setq buffer-file-name "/tmp/alive.txt"))
                          b))))
               ((symbol-function 'find-file)
-               (lambda (f) (setq opened f))))
+               (lambda (f &rest _) (setq opened f))))
+      (unwind-protect
+          (cj/undo-kill-buffer 1)
+        (when (get-buffer "*test-alive*") (kill-buffer "*test-alive*"))))
+    (should (equal opened "/tmp/dead.org"))))
+
+(ert-deftest test-ui-navigation-undo-kill-buffer-skips-open-file-at-head ()
+  "Boundary: an open file at the head of the list is skipped (equal, not eq).
+The previous delq compared expand-file-name strings by identity, so a
+currently-open most-recent file was never skipped."
+  (let ((opened nil)
+        (recentf-mode t)
+        ;; The open file is FIRST — only an equal-based filter removes it.
+        (recentf-list '("/tmp/alive.txt" "/tmp/dead.org")))
+    (cl-letf (((symbol-function 'require) (lambda (&rest _) t))
+              ((symbol-function 'recentf-mode) (lambda (&rest _) t))
+              ((symbol-function 'buffer-list)
+               (lambda (&rest _)
+                 (list (let ((b (get-buffer-create "*test-alive*")))
+                         (with-current-buffer b
+                           (setq buffer-file-name "/tmp/alive.txt"))
+                         b))))
+              ((symbol-function 'find-file)
+               (lambda (f &rest _) (setq opened f))))
       (unwind-protect
           (cj/undo-kill-buffer 1)
         (when (get-buffer "*test-alive*") (kill-buffer "*test-alive*"))))
@@ -85,7 +108,7 @@ non-visited entry, not the second."
               ((symbol-function 'recentf-mode) (lambda (&rest _) t))
               ((symbol-function 'buffer-list) (lambda (&rest _) nil))
               ((symbol-function 'find-file)
-               (lambda (f) (setq opened f))))
+               (lambda (f &rest _) (setq opened f))))
       (cj/undo-kill-buffer 2))
     (should (equal opened "/tmp/b.org"))))
 
@@ -98,7 +121,7 @@ non-visited entry, not the second."
               ((symbol-function 'recentf-mode) (lambda (&rest _) t))
               ((symbol-function 'buffer-list) (lambda (&rest _) nil))
               ((symbol-function 'find-file)
-               (lambda (f) (setq opened f))))
+               (lambda (f &rest _) (setq opened f))))
       (cj/undo-kill-buffer 0))
     (should-not opened)))
 
@@ -111,7 +134,7 @@ not a wrong-type-argument from find-file on nil."
     (cl-letf (((symbol-function 'require) (lambda (&rest _) t))
               ((symbol-function 'recentf-mode) (lambda (&rest _) t))
               ((symbol-function 'buffer-list) (lambda (&rest _) nil))
-              ((symbol-function 'find-file) (lambda (f) (setq opened f))))
+              ((symbol-function 'find-file) (lambda (f &rest _) (setq opened f))))
       (should-error (cj/undo-kill-buffer 5) :type 'user-error))
     (should-not opened)))