ryuslash/emacs-config
1
0
Fork 0
Code Activity

[oni-ediff] Enable floating control frame

Browse source
This commit is contained in:
Tom Willemse 2023-08-09 13:14:01 -07:00
parent fd6c642a7e
commit 2176f9319b
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
oni-ediff.el
View file

@ -4,7 +4,7 @@
;; Author: Tom Willemse <tom@ryuslash.org> ;; Author: Tom Willemse <tom@ryuslash.org>
;; Keywords: local ;; Keywords: local
;; Version: 2021.1123.002904 ;; Version: 2023.0809.131051
;; This program is free software; you can redistribute it and/or modify ;; 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 ;; 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 #'oni-ediff--turn-off-fullscreen)
(add-hook 'ediff-cleanup-hook 'winner-undo) (add-hook 'ediff-cleanup-hook 'winner-undo)
(when (boundp 'ediff-floating-control-frame)
(setq ediff-floating-control-frame t))
(provide 'oni-ediff) (provide 'oni-ediff)
;;; oni-ediff.el ends here ;;; oni-ediff.el ends here