From 7d29cd47080607a1d69ba46666009844c0555b73 Mon Sep 17 00:00:00 2001 From: NJBS Date: Wed, 6 Jul 2016 14:36:16 -0400 Subject: [PATCH] Fix #6500, only change ediff hook if org loaded --- layers/+distributions/spacemacs-base/packages.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/layers/+distributions/spacemacs-base/packages.el b/layers/+distributions/spacemacs-base/packages.el index 4ada92c81..177e15121 100644 --- a/layers/+distributions/spacemacs-base/packages.el +++ b/layers/+distributions/spacemacs-base/packages.el @@ -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))))