diff options
| author |  Tom Willemse | 2023-08-09 13:14:01 -0700 |
|---|---|---|
| committer | Tom Willemse | 2023-08-09 13:14:01 -0700 |
| commit | 2176f9319b94466c0335555a9fe73ecf83c5070c (patch) | |
| tree | 01ca1559cc0a4dd4b593fcd6a318c9bc16da87f4 /oni-ediff.el | |
| parent | fd6c642a7edeb7cb527030f031704e5cc1054c03 (diff) | |
| download | emacs-config-2176f9319b94466c0335555a9fe73ecf83c5070c.tar.gz emacs-config-2176f9319b94466c0335555a9fe73ecf83c5070c.zip | |
[oni-ediff] Enable floating control frame
Diffstat (limited to 'oni-ediff.el')
| -rw-r--r-- | oni-ediff.el | 5 |
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 |