Robert Pluim writes: >>>>>> On Wed, 28 Jun 2023 08:55:13 -0400, Spencer Baugh said: > > Spencer> * lisp/vc/ediff-wind.el (ediff-floating-control-frame): Add > Spencer> defcustom. > Spencer> (ediff-frame-make-utility, ediff-setup-control-frame): Allow setting > Spencer> the control frame up as a utility window under X. (bug#62164) > > Two spaces after full stop. And I think the convention is to > capitalize 'Bug', but we donʼt follow that very consistently. > > I think the new user option warrants an entry in etc/NEWS Added, patch at the end. > Spencer> --- > Spencer> lisp/vc/ediff-wind.el | 22 ++++++++++++++++++++++ > Spencer> 1 file changed, 22 insertions(+) > > Spencer> diff --git a/lisp/vc/ediff-wind.el b/lisp/vc/ediff-wind.el > Spencer> index eb903f093f9..74e0e1f9b9f 100644 > Spencer> --- a/lisp/vc/ediff-wind.el > Spencer> +++ b/lisp/vc/ediff-wind.el > Spencer> @@ -69,6 +69,16 @@ ediff-window-setup-function > Spencer> (function :tag "Other function")) > Spencer> :version "24.3") > > Spencer> +(defcustom ediff-floating-control-frame nil > Spencer> + "If not-nil, try making the control frame be floating rather than tiled. > Spencer> + > > Style: the description of the option should state the action that > follows from a non-nil value: > > "Whether to request a floating control frame rather than a tiled one." No, this is correct style, see (info "(elisp) Documentation Tips") • The documentation string for a variable that is a yes-or-no flag should start with words such as “Non-nil means”, to make it clear that all non-‘nil’ values are equivalent and indicate explicitly what ‘nil’ and non-‘nil’ mean.