 
 ;; Quickly undo pop-ups or other window configurations.
 (use-package winner :ensure t
-  :init (winner-mode 1))
+  :init (winner-mode 1)
+  :bind (("<S-escape>" . winner-redo)
+         ("<escape>" . winner-undo)))
+
 (setq winner-boring-buffers
       (append winner-boring-buffers '("*helm M-x*"
                                       "helm mini*"

  (nxml-mode))

;; Enhanced list-packages replacement.
(use-package paradox :ensure t)

;; Peak into macros by expanding them inline.
(use-package macrostep :ensure t)

(use-package magit :ensure t
  :config
  (setq magit-status-buffer-switch-function #'switch-to-buffer)
  (fullframe magit-status magit-mode-quit-window)
  :bind ("C-x g" . magit-status))

;; Use vc-ediff as default.
