                         state rdebug-window-configuration-state)
   (when (not (eq state rdebug-window-configuration-state))
     ;; Save the previous state.
-    (cond ((eq rdebug-window-configuration-state 'debugger)
+    (cond ((not (eq rdebug-window-configuration-state 'original))
            (setq rdebug-debugger-window-configuration
                  (current-window-configuration)))
           ((eq rdebug-window-configuration-state 'original)

    (unless dont-restore
      ;; Switch to the saved state,
      (cond
       ((eq state 'debugger)
        (if rdebug-debugger-window-configuration
            (set-window-configuration rdebug-debugger-window-configuration)))
       ((eq state 'original)

 V - Variables buffer
 W - Watch buffer

 SPC - step (into)
 +   - step+
 c   - continue
 f   - finish (step out)
 n   - next (step over)
 p   - print
 q   - quit
 r   - run
 s   - step (into)

 > - go down frame (with numeric argument goes down that many frames)
 < - go up one frame (with numeric argument goes down that many frames)

 ? - This help text.
"))))
