From 2176f9319b94466c0335555a9fe73ecf83c5070c Mon Sep 17 00:00:00 2001
From: Tom Willemse
Date: Wed, 9 Aug 2023 13:14:01 -0700
Subject: [oni-ediff] Enable floating control frame

---
 oni-ediff.el | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'oni-ediff.el')

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
-- 
cgit v1.2.3-54-g00ecf