From: Spencer Baugh <sbaugh@catern.com>
Date: Fri, 7 Apr 2023 21:54:06 +0000 (-0400)
Subject: ; * etc/NEWS: News entry for previous change (bug#62164).
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=193031299231a026b8c855eff213fc63be28692d;p=emacs.git

; * etc/NEWS: News entry for previous change (bug#62164).
---

diff --git a/etc/NEWS b/etc/NEWS
index ab975da5e7f..1a86c9e55e2 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -168,6 +168,16 @@ This allows changing which type of whitespace changes are ignored when
 regenerating hunks with 'diff-ignore-whitespace-hunk'.  Defaults to
 the previously hard-coded "-b".
 
+** Ediff
+
+---
+*** New user option 'ediff-floating-control-frame'.
+If non-nil, try making the control frame be floating rather than tiled.
+
+Many X tiling window managers make the Ediff control frame a tiled
+window equal in size to the main Emacs frame, which works poorly.
+This option is useful to set if you use such a window manager.
+
 ** Buffer Selection
 
 ---