     (define-key map [menu-bar debugger view output]
       '(menu-item "Output" rdebug-display-output-buffer))
 
-    (define-key map [menu-bar debugger view display]
-      '(menu-item "Watch" rdebug-display-display-buffer))
+    (define-key map [menu-bar debugger view watch]
+      '(menu-item "Watch" rdebug-display-watch-buffer))
 
     (define-key map [menu-bar debugger view stack]
       '(menu-item "Stack trace" rdebug-display-stack-buffer))

          (set-process-sentinel process
                                'rdebug-process-sentinel)))

    (set (make-local-variable 'gud-minor-mode) 'rdebug)

    (gud-def gud-args   "info args" "a"
	     "Show arguments of current stack.")

(defun rdebug-display-original-window-configuration ()
  "Display the layout of windows prior to starting the ruby debugger."
  (interactive)
  (rdebug-set-window-configuration-state 'original)
  (message
   "Type `M-x rdebug-display-debugger-window-configuration RET' to restore."))

(defun rdebug-display-debugger-window-configuration ()
  "Display the corrent layout of windows of the ruby debugger."
  (interactive)
  (rdebug-set-window-configuration-state 'debugger)
  (message
   "Type `M-x rdebug-display-original-window-configuration RET' to restore."))

(defun rdebug-set-windows (&optional name)
  "Sets window used in multi-window frame and issues
