From 8c701ef7d40805537f948bc89332b202d94c5e1e Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Wed, 6 Mar 2019 19:57:38 -0500 Subject: [PATCH] Fix void-variable error from ediff config --- core/core-ui.el | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/core-ui.el b/core/core-ui.el index 59c25a311..691e679d7 100644 --- a/core/core-ui.el +++ b/core/core-ui.el @@ -254,13 +254,15 @@ read-only or not file-visiting." ediff-split-window-function #'split-window-horizontally ediff-window-setup-function #'ediff-setup-windows-plain) :config + (defvar doom--ediff-saved-wconf nil) ;; Restore window config after quitting ediff (defun doom|ediff-save-wconf () - (setq +ediff--saved-wconf (current-window-configuration))) + (setq doom--ediff-saved-wconf (current-window-configuration))) (add-hook 'ediff-before-setup-hook #'doom|ediff-save-wconf) (defun doom|ediff-restore-wconf () - (set-window-configuration +ediff--saved-wconf)) + (when (window-configuration-p doom--ediff-saved-wconf) + (set-window-configuration doom--ediff-saved-wconf))) (add-hook 'ediff-quit-hook #'doom|ediff-restore-wconf 'append) (add-hook 'ediff-suspend-hook #'doom|ediff-restore-wconf 'append))