     (define-key map [(control m)] 'rdebug-goto-breakpoint)
     (define-key map [?d] 'rdebug-delete-breakpoint)
     (rdebug-populate-secondary-buffer-map map)
-
-    (define-key map "\C-x\C-a" rdebug-common-map)
-    (rdebug-populate-secondary-buffer-map rdebug-common-map t)
 
     ;; --------------------
     ;; The "Breakpoints window" submeny.

;; -- variables

(defvar rdebug-variables-mode-map
  (let ((map (make-sparse-keymap))
	(rdebug-common-map (make-sparse-keymap)))
    (suppress-keymap map)
    (define-key map "\r" 'rdebug-variables-edit)
    (define-key map "e" 'rdebug-edit-variables-value)
    (define-key map [mouse-2] 'rdebug-variables-edit-mouse)
    (define-key map [mouse-3] 'rdebug-variables-edit-mouse)
    (rdebug-populate-secondary-buffer-map map)

    (define-key map "\C-x\C-a" rdebug-common-map)
    (rdebug-populate-secondary-buffer-map rdebug-common-map t)

    ;; --------------------
    ;; The "Variables window" submeny.

;; -- watch (the "display" annotation)

(defvar rdebug-watch-mode-map
  (let ((map (make-sparse-keymap)))
    (suppress-keymap map)
    (define-key map "a" 'rdebug-watch-add)
    (define-key map "\C-d" 'rdebug-watch-delete)
