Skip to content
This repository has been archived by the owner on Oct 25, 2022. It is now read-only.

Commit

Permalink
Avoid initializing twice
Browse files Browse the repository at this point in the history
You could call evil-ediff-init before loading evil-ediff and evil-ediff-init
would have executed twice.
  • Loading branch information
justbur committed Jul 24, 2017
1 parent afcb66b commit 67b0e69
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion evil-ediff.el
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,9 @@
(evil-set-initial-state 'ediff-mode 'motion)
(add-hook 'ediff-startup-hook 'evil-ediff-startup-hook)
(evil-ediff-adjust-help))
(evil-ediff-init)

(unless (featurep 'evil-ediff)
(evil-ediff-init))

(defun evil-ediff-revert ()
"Revert changes made by evil-ediff."
Expand Down

0 comments on commit 67b0e69

Please sign in to comment.