aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--oni-ediff.el5
1 files changed, 4 insertions, 1 deletions
diff --git a/oni-ediff.el b/oni-ediff.el
index 51ccab0..7449c34 100644
--- a/oni-ediff.el
+++ b/oni-ediff.el
@@ -4,7 +4,7 @@
;; Author: Tom Willemse <tom@ryuslash.org>
;; Keywords: local
-;; Version: 2021.1123.002904
+;; Version: 2023.0809.131051
;; This program is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
@@ -86,5 +86,8 @@
(add-hook 'ediff-cleanup-hook #'oni-ediff--turn-off-fullscreen)
(add-hook 'ediff-cleanup-hook 'winner-undo)
+(when (boundp 'ediff-floating-control-frame)
+ (setq ediff-floating-control-frame t))
+
(provide 'oni-ediff)
;;; oni-ediff.el ends here