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

diff --git a/etc/NEWS b/etc/NEWS
index ab975da5e7fe8450abfe59067c792d8e57443e41..1a86c9e55e2e5ede0fff0fcedd6aeb521252eb11 100644 (file)
--- 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
 
 ---