master 5781f0af7d: Merge from origin/emacs-28

[Stefan Kangas]

branch: master
commit 5781f0af7dae91097f797e93a63cb733b2b66f1d
Merge: c7f085b53f c4596c8522
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    Merge from origin/emacs-28
    
    c4596c8522 Fix a regression in 'decipher-digram-list'
---
 lisp/play/decipher.el | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/lisp/play/decipher.el b/lisp/play/decipher.el
index 7f821bf4cf..bb3369de5f 100644
--- a/lisp/play/decipher.el
+++ b/lisp/play/decipher.el
@@ -978,13 +978,14 @@ if it can't, it signals an error."
     decipher-stats-buffer)
    ;; Create a new buffer if requested:
    (create
-    (let ((stats-name (concat "*" (buffer-name) "*")))
+    (let* ((stats-name (concat "*" (buffer-name) "*"))
+           (buf (get-buffer stats-name)))
       (setq decipher-stats-buffer
-            (if (eq 'decipher-stats-mode
-                    (buffer-local-value 'major-mode
-                                        (get-buffer stats-name)))
-                ;; We just lost track of the statistics buffer:
-                (get-buffer stats-name)
+            (if (and (bufferp buf)
+                     (eq 'decipher-stats-mode
+                         (buffer-local-value 'major-mode buf)))
+                buf
+              ;; We just lost track of the statistics buffer:
               (generate-new-buffer stats-name))))
     (with-current-buffer decipher-stats-buffer
       (decipher-stats-mode))