master 6940cebe03 2/2: Make bubbles-quit obsolete in favor of quit-window

[Stefan Kangas]

branch: master
commit 6940cebe032858e307fa24fb32ba9f5c8cb56835
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    Make bubbles-quit obsolete in favor of quit-window
    
    * lisp/play/bubbles.el (bubbles-quit): Make obsolete in favor of
    quit-window.  Update uses.
---
 lisp/play/bubbles.el | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/lisp/play/bubbles.el b/lisp/play/bubbles.el
index 93fbc3b51b..808fc82d19 100644
--- a/lisp/play/bubbles.el
+++ b/lisp/play/bubbles.el
@@ -30,6 +30,8 @@
 ;; Bubbles is an implementation of the "Same Game", similar to "Same
 ;; GNOME" and many others, see <https://en.wikipedia.org/wiki/SameGame>.
 
+;;; Code:
+
 ;; ======================================================================
 
 ;;; History:
@@ -70,8 +72,6 @@
 
 ;; ======================================================================
 
-;;; Code:
-
 (require 'gamegrid)
 
 ;; User options
@@ -812,7 +812,7 @@ static char * dot3d_xpm[] = {
 (defvar-keymap bubbles-mode-map
   :doc "Mode map for `bubbles'."
   :name 'bubbles-mode-map
-  "q"   #'bubbles-quit
+  "q"   #'quit-window
   "C-j" #'bubbles-plop
   "SPC" #'bubbles-plop
   "C-m" #'bubbles-plop
@@ -871,7 +871,7 @@ static char * dot3d_xpm[] = {
     ["Save all settings" bubbles-save-settings]
     "---"
     ["New game" bubbles]
-    ["Quit" bubbles-quit]))
+    ["Quit" quit-window]))
 
 ;; bind menu to mouse
 (define-key bubbles-mode-map [down-mouse-3] bubbles-menu)
@@ -910,6 +910,7 @@ columns on its right towards the left.
 
 (defun bubbles-quit ()
   "Quit Bubbles."
+  (declare (obsolete quit-window "29.1"))
   (interactive nil bubbles-mode)
   (message "bubbles-quit")
   (bury-buffer))