   (rdebug-debug-enter "rdebug-setup-windows"
     (rdebug-set-window-configuration-state 'debugger t)
     (pop-to-buffer gud-comint-buffer)
-    (rdebug-process-annotation "help" "")
+    (maphash
+     (lambda (name func)
+       (rdebug-process-annotation name ""))
+     rdebug--annotation-setup-map)
     (let ((buf
            (cond (gud-last-last-frame
                   (gud-find-file (car gud-last-last-frame)))

      (rdebug-menu-item common-map
                        "Breakpoints" 'rdebug-display-breakpoints-buffer))
    menu))


;; -- Ruby debugger support for other modes.

(defvar rdebug-debugger-support-minor-mode-map-when-deactive
  (let ((map (make-sparse-keymap)))
    (rdebug-populate-debugger-menu map)
    map)
  "Keymap used by rdebugs support minor mode when the debugger is active.")

(defvar rdebug-debugger-support-minor-mode-map-when-active
  (let ((map (make-sparse-keymap)))
    (rdebug-populate-common-keys map)
    (rdebug-populate-debugger-menu map)
    map)
  "Keymap used by rdebugs support minor mode when the debugger not active.")


(define-minor-mode rdebug-debugger-support-minor-mode
  "Minor mode active in source buffers that use the `rdebug' Ruby debugger."
  :group rdebug
  :global nil
  :init-value nil
  :keymap rdebug-debugger-support-minor-mode-map-when-deactive
  ())


;;;###autoload
(defun rdebug-turn-on-debugger-support ()
  "Enable extra source buffer support for the `rdebug' Ruby debugger.

This includes a 'Debugger' menu and special key bindings when the
debugger is active."
  (rdebug-debugger-support-minor-mode 1))


;; -- Secondary buffer support.

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

