       (define-key menu [layout] (cons "Window Layout" submenu)))
 
     (define-key map [menu-bar debugger layout initial]
-      '(menu-item "Initial Debugger Layout" rdebug-restore-windows))
+      (rdebug-menu-item common-map
+                        "Initial Debugger Layout" 'rdebug-restore-windows))
 
     (define-key map [menu-bar debugger layout line1] '(menu-item "--"))
 
     (define-key map [menu-bar debugger layout debugger]
-      '(menu-item "Current Debugger Layout"
-                  rdebug-display-debugger-window-configuration
-                  :button
-                  (:radio
-                   . (eq rdebug-window-configuration-state 'debugger))))
+      (rdebug-menu-item common-map "Current Debugger Layout"
+                        'rdebug-display-debugger-window-configuration
+                        :button
+                        '(:radio
+                          . (eq rdebug-window-configuration-state 'debugger))))
 
     (define-key map [menu-bar debugger layout original]
-      '(menu-item "Original Layout"
-                  rdebug-display-original-window-configuration
-                  :button
-                  (:radio
-                   . (eq rdebug-window-configuration-state 'original))))
+      (rdebug-menu-item common-map "Original Layout"
+                        'rdebug-display-original-window-configuration
+                        :button
+                        '(:radio
+                          . (eq rdebug-window-configuration-state 'original))))
 
     ;; --------------------
     ;; The "View" submeny.

;;; eval:(put 'rdebug-debug-enter 'lisp-indent-hook 1)
;;; End:

;;; rdebug-code.el ends here

      (define-key menu [view] (cons "View" submenu)))

    (define-key map [menu-bar debugger view output]
      (rdebug-menu-item common-map "Output" 'rdebug-display-output-buffer))

    (define-key map [menu-bar debugger view watch]
      (rdebug-menu-item common-map "Watch" 'rdebug-display-watch-buffer))

    (define-key map [menu-bar debugger view stack]
      (rdebug-menu-item common-map "Stack trace" 'rdebug-display-stack-buffer))

    (define-key map [menu-bar debugger view shell]
      (rdebug-menu-item common-map "Debugger Shell" 'rdebug-display-cmd-buffer))

    (define-key map [menu-bar debugger view variables]
      (rdebug-menu-item common-map "Variables" 'rdebug-display-variables-buffer))

    (define-key map [menu-bar debugger view breakpoints]
      (rdebug-menu-item common-map
                        "Breakpoints" 'rdebug-display-breakpoints-buffer))
    menu))


