   (rdebug-debug-enter "rdebug-process-annotation"
   ;; Ruby-debug uses the name "starting" for process output (just like
   ;; GDB). However, it's better to present the buffer as "output" to
-  ;; the user.
-  (if (string= name "starting")
-      (setq name "output"))
+  ;; the user. Ditto for "display" and "watch".
+  (cond ((string= name "starting")
+         (setq name "output"))
+        ((string= name "display")
+         (setq name "watch")))
   (let ((buf (get-buffer-create (format "*rdebug-%s-%s*" name gud-target-name)))
         ;; Buffer local, doesn't survive the buffer change.
         (comint-buffer gud-comint-buffer))

    (define-key map "e" 'rdebug-edit-variables-value)
    (define-key map [mouse-2] 'rdebug-variables-edit-mouse)
    (define-key map [mouse-3] 'rdebug-variables-edit-mouse)
    (define-key map "q" 'kill-this-buffer)
    (rdebug-populate-secondary-buffer-map map)
     map))

(defun rdebug-variables-mode ()
  "Major mode for rdebug variables.

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

    ;; This opens up "Gud" menu, which isn't used since we've got our
    ;; own "Debugger" menu.

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

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