            (target-name (file-name-nondirectory (car script-name-annotate-p)))
            (annotate-p (cadr script-name-annotate-p))
            (rdebug-buffer-name (format "*rdebug-cmd-%s*" target-name))
-           (rdebug-buffer (get-buffer rdebug-buffer-name))
-	   (rdebug-common-map (make-sparse-keymap)))
+           (rdebug-buffer (get-buffer rdebug-buffer-name)))
 
       ;; `gud-rdebug-massage-args' needs whole `command-line'.
       ;; command-line is refered through dyanmic scope.

  (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 ()

    (define-key map "0" 'rdebug-goto-entry-10)

    (rdebug-populate-secondary-buffer-map map)

    ;; --------------------
    ;; The "Watch window" submeny.
