TakeV/spacemacs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix #6500, only change ediff hook if org loaded

Browse source
This commit is contained in:
NJBS 2016-07-06 14:36:16 -04:00 committed by syl20bnr
parent afc6f8561e
commit 7d29cd4708
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
layers/+distributions/spacemacs-base/packages.el
View file

@ -125,7 +125,8 @@
ediff-split-window-function 'split-window-horizontally
ediff-merge-split-window-function 'split-window-horizontally)
;; show org ediffs unfolded
(add-hook 'ediff-prepare-buffer-hook #'outline-show-all)
(with-eval-after-load 'org
(add-hook 'ediff-prepare-buffer-hook #'outline-show-all))
;; restore window layout when done
(add-hook 'ediff-quit-hook #'winner-undo))))