emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix void-variable error from ediff config

Browse source
This commit is contained in:
Henrik Lissner 2019-03-06 19:57:38 -05:00
parent 31688c921d
commit 8c701ef7d4
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
core/core-ui.el
View file

@ -254,13 +254,15 @@ read-only or not file-visiting."
ediff-split-window-function #'split-window-horizontally ediff-split-window-function #'split-window-horizontally
ediff-window-setup-function #'ediff-setup-windows-plain) ediff-window-setup-function #'ediff-setup-windows-plain)
:config :config
(defvar doom--ediff-saved-wconf nil)
;; Restore window config after quitting ediff ;; Restore window config after quitting ediff
(defun doom|ediff-save-wconf () (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) (add-hook 'ediff-before-setup-hook #'doom|ediff-save-wconf)
(defun doom|ediff-restore-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-quit-hook #'doom|ediff-restore-wconf 'append)
(add-hook 'ediff-suspend-hook #'doom|ediff-restore-wconf 'append)) (add-hook 'ediff-suspend-hook #'doom|ediff-restore-wconf 'append))