master 12d01caaefc 4/4: Merge from origin/emacs-29

[Jim Porter]

branch: master
commit 12d01caaefc05f570bab953a9ddf961afe260ba7
Merge: d792bbdc2c0 b72f23a532b
Author: Jim Porter <jporterbugs@gmail.com>
Commit: Jim Porter <jporterbugs@gmail.com>

    Merge from origin/emacs-29
    
    b72f23a532b ; Fix 'desktop-restore-reuses-frames' customize values
---
 lisp/desktop.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/desktop.el b/lisp/desktop.el
index 59298699914..f096f13ab80 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -455,7 +455,7 @@ If nil, deletes existing frames.
 If `keep', keeps existing frames and does not reuse them."
   :type '(choice (const :tag "Reuse existing frames" t)
                 (const :tag "Delete existing frames" nil)
-                (const :tag "Keep existing frames" :keep))
+                (const :tag "Keep existing frames" keep))
   :group 'desktop
   :version "24.4")