 ;; -- watch (the "display" annotation)
 
 (defvar rdebug-watch-mode-map
-  (let ((map (make-sparse-keymap))
-	(rdebug-common-map (make-sparse-keymap)))
+  (let ((map (make-sparse-keymap)))
     (suppress-keymap map)
     (define-key map "a" 'rdebug-watch-add)
     (define-key map "\C-d" 'rdebug-watch-delete)

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

      ;; `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))


(defun rdebug-populate-secondary-buffer-map (map)
  "Bind all common keys and menu used in the rdebug seondary buffers.
This includes the keys bound to `gud-key-prefix' (typically C-x
C-a)."
  (rdebug-populate-secondary-buffer-map-plain map)
  (rdebug-populate-common-keys map)
  (rdebug-populate-debugger-menu map)
  (let ((prefix-map (make-sparse-keymap)))
    (rdebug-populate-secondary-buffer-map-plain prefix-map)
    (define-key map gud-key-prefix prefix-map)))


(defun rdebug-display-breakpoints-buffer ()
