     (rdebug-populate-secondary-buffer-map map)
 
     ;; --------------------
-    ;; The "Watch window" submeny.
+    ;; The "Watch window" submenu.
     (let ((submenu (make-sparse-keymap)))
       (define-key-after map [menu-bar debugger watch]
         (cons "Watch window" submenu)

                   (eq process (get-buffer-process gud-comint-buffer)))
               (eq rdebug-window-configuration-state 'debugger)
               (not (eq (process-status process) 'run)))
      (rdebug-set-window-configuration-state 'original))
    ;; This unbinds the special debugger keys of the source buffers.
    (setcdr (assq 'rdebug-debugger-support-minor-mode minor-mode-map-alist)
            rdebug-debugger-support-minor-mode-map-when-deactive)))


;; -- Reset support


    (define-key map [menu-bar debugger line2] '(menu-item "--"))

    ;; --------------------
    ;; The "Options" submenu.

    (let ((submenu (make-sparse-keymap)))
      (define-key menu [options] (cons "Options" submenu)))

    (define-key map [menu-bar debugger options short-key-mode]
      (rdebug-menu-item common-map
                        "Short keys in source" 'rdebug-short-key-mode
                        :button
                        '(:toggle
                          . rdebug-short-key-mode)))

    ;; --------------------
    ;; The optional secondary windows submenu.


    ;; Placeholder used when populating the menu of the secondary buffers.
    (define-key menu [placeholder] nil)

    ;; --------------------
    ;; The "Window Layout" submenu.
    (let ((submenu (make-sparse-keymap)))
      (define-key menu [layout] (cons "Window Layout" submenu)))

