master 2009832 2/2: Make `menu-bar-select-buffer' obsolete

[Lars Ingebrigtsen]

branch: master
commit 2009832a8229ac90c255bdb0f2dd333e8a2a48be
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>

    Make `menu-bar-select-buffer' obsolete
    
    * lisp/menu-bar.el (menu-bar-select-buffer): Make obsolete (bug#15651).
    
    * lisp/msb.el (msb--select-buffer): Move function here and rename.
    (msb--make-keymap-menu): Use it.
---
 lisp/menu-bar.el | 1 +
 lisp/msb.el      | 9 ++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index b71c650..739e751 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -2241,6 +2241,7 @@ Buffers menu is regenerated."
   "String to display in buffer listings for buffers not visiting a file.")
 
 (defun menu-bar-select-buffer ()
+  (declare (obsolete nil "28.1"))
   (interactive)
   (switch-to-buffer last-command-event))
 
diff --git a/lisp/msb.el b/lisp/msb.el
index 1064f94..1f05e9d 100644
--- a/lisp/msb.el
+++ b/lisp/msb.el
@@ -1052,9 +1052,12 @@ variable `msb-menu-cond'."
       (msb--split-menus-2 list 0 nil)
     list))
 
+(defun msb--select-buffer ()
+  (interactive)
+  (switch-to-buffer last-command-event))
+
 (defun msb--make-keymap-menu (raw-menu)
-  (let ((end 'menu-bar-select-buffer)
-       (mcount 0))
+  (let ((mcount 0))
     (mapcar
      (lambda (sub-menu)
        (cond
@@ -1063,7 +1066,7 @@ variable `msb-menu-cond'."
        (t
         (let ((buffers (mapcar (lambda (item)
                                  (cons (buffer-name (cdr item))
-                                       (cons (car item) end)))
+                                       (cons (car item) 'msb--select-buffer)))
                                (cdr sub-menu))))
           (nconc (list (cl-incf mcount) (car sub-menu)
                        'keymap (car sub-menu))