 ;; -- breakpoints
 
 (defvar rdebug-breakpoints-mode-map
-  (let ((map (make-sparse-keymap))
-	(menu (make-sparse-keymap "Breakpoints")))
-    (define-key menu [quit] '("Quit"   . rdebug-delete-frame-or-window))
-    (define-key menu [goto] '("Goto"   . rdebug-goto-breakpoint))
-    (define-key menu [delete] '("Delete" . rdebug-delete-breakpoint))
-    (define-key menu [toggle] '("Toggle" . rdebug-toggle-breakpoint))
+  (let ((map (make-sparse-keymap)))
     (define-key map [mouse-2] 'rdebug-goto-breakpoint-mouse)
     (define-key map " " 'rdebug-toggle-breakpoint)
     (define-key map [? ] 'rdebug-toggle-breakpoint)
     (define-key map [(control m)] 'rdebug-goto-breakpoint)
     (define-key map [?d] 'rdebug-delete-breakpoint)
-    (rdebug-secondary-buffer-populate-map map menu)
+    (rdebug-populate-secondary-buffer-map map)
+    (define-key map [menu-bar debugger breakpoints delete]
+      '(menu-item "Delete breakpoint" rdebug-delete-breakpoint))
     map)
   "Keymap to navigate/set/enable rdebug breakpoints.")
 

(defvar rdebug-secondary-window-help-mode-map
  (let ((map (make-sparse-keymap)))
    (suppress-keymap map)
    (rdebug-secondary-buffer-populate-map map)
    map))

(defun rdebug-secondary-window-help-mode ()

  (define-key map "f" 'gud-finish)
  (define-key map "n" 'gud-next)
  (define-key map "p" 'gud-print)
  (define-key map "q" 'rdebug-quit)
  (define-key map "r" 'gud-run)
  (define-key map "s" 'gud-step)
  ;(define-key map "t" 'gud-tbreak)
  ;; Returns the menu.
  (if no-menu
      nil
    (rdebug-populate-common-keys map)
    (rdebug-populate-debugger-menu map)))


(defun rdebug-display-breakpoints-buffer ()
  "Display the rdebug breakpoints buffer."
