From c2d22c47de2774e78404ad9940517416241299e5 Mon Sep 17 00:00:00 2001 From: Phil Hudson Date: Tue, 21 May 2024 12:03:24 +0100 Subject: [PATCH 1/2] Fix buggy special-display-buffer-names check. --- cider-popup.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cider-popup.el b/cider-popup.el index 5d7beb564..d8850f631 100644 --- a/cider-popup.el +++ b/cider-popup.el @@ -64,7 +64,7 @@ by adding BUFFER-NAME to the `special-display-buffer-names' list." ;; another time through `cider-popup-buffer-display'): (if (and (boundp 'special-display-buffer-names) (seq-find (lambda (entry) - (equal (car entry) buffer-name)) + (equal (if (listp entry) (car entry) entry) buffer-name)) special-display-buffer-names)) (progn (display-buffer buffer-name) From 1ff966208b9535e38ca3149eeddd97d71ef942dc Mon Sep 17 00:00:00 2001 From: Phil Hudson Date: Tue, 21 May 2024 12:21:18 +0100 Subject: [PATCH 2/2] Doco for PR #3673. --- CHANGELOG.md | 1 + cider-popup.el | 3 +++ 2 files changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fa326e539..d8a1c43f4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,6 +35,7 @@ ### Bugs fixed +- [#3673](https://github.com/clojure-emacs/cider/pull/3673): Fix buggy `special-display-buffer-names` check. - [#3600](https://github.com/clojure-emacs/cider/pull/3600): Fix scittle jack-in when using `cider-jack-in-clj`. - [#3663](https://github.com/clojure-emacs/cider/issues/3663): Fix `cider-interactive-eval-override` invocation. diff --git a/cider-popup.el b/cider-popup.el index d8850f631..d5e797b92 100644 --- a/cider-popup.el +++ b/cider-popup.el @@ -64,6 +64,9 @@ by adding BUFFER-NAME to the `special-display-buffer-names' list." ;; another time through `cider-popup-buffer-display'): (if (and (boundp 'special-display-buffer-names) (seq-find (lambda (entry) + ;; Fix issue #3672 Phil Hudson 2024-05-21 + ;; entry can be either a list or a string + ;; Previous code falsely assumed entry is always a list (equal (if (listp entry) (car entry) entry) buffer-name)) special-display-buffer-names)) (progn