 
     ;; Add the buffer-displaying commands to the Gud buffer,
     ;; accessible using the C-c prefix.
-    (rdebug-secondary-buffer-populate-map
-     (lookup-key (current-local-map) "\C-c"))
+    (rdebug-populate-secondary-buffer-map
+     (lookup-key (current-local-map) "\C-c")
+     t)
+
+    (rdebug-populate-debugger-menu (current-local-map))
+    (rdebug-populate-common-keys (current-local-map))
 
     ;; Update GUD menu bar
     (define-key gud-menu-map [args]      '("Show arguments of current stack" . 


;; -- General, for all secondary buffers.

(defun rdebug-secondary-buffer-populate-map (map &optional menu)
  (define-key map " " 'gud-step)
  (define-key map "+" 'gud-step-plus)
  (define-key map "<" 'gud-up)
  (define-key map ">" 'gud-down)
  (define-key map "?" 'rdebug-display-secondary-window-help-buffer)
  (define-key map "B" 'rdebug-display-breakpoints-buffer)
  (define-key map "C" 'rdebug-display-cmd-buffer)

    (define-key map [mouse-1] 'rdebug-goto-stack-frame-mouse)
    (define-key map [mouse-2] 'rdebug-goto-stack-frame-mouse)
    (define-key map [(control m)] 'rdebug-goto-stack-frame)
    (rdebug-populate-secondary-buffer-map map)
    map)
  "Keymap to navigate rdebug stack frames.")

