bug#52504: 28.0.90; Ediff control buffer not fully resized

bug#52504: 28.0.90; Ediff control buffer not fully resized

[Kevin Fleming]

When running ediff in a terminal (reproducible with emacs -Q -nw), or in
a GUI with (setq ediff-window-setup-function 'ediff-setup-windows-plain),
pressing the ? key only increases the size of the control buffer's
window by 2 lines, not enough to display the full help text. Using git
bisect suggests that this started happening with this commit on the
emacs-28 branch:

[f26a027d6b8e0b894d5d28c446643d411b376ea9] Fix ediff3 layouts with window-combination-resize non-nil (Bug#49277)

In GNU Emacs 28.0.90 (build 1, x86_64-apple-darwin20.6.0, NS appkit-2022.60 Version 11.6 (Build 20G165))
 of 2021-12-05 built on mbp.local
Repository revision: 59f1bcd3e8f2d5e71ca2212983756609d21e7d37
Repository branch: HEAD
Windowing system distributor 'Apple', version 10.3.2022
System Description:  macOS 11.6

Configured using:
 'configure --with-ns --with-modules
 '--enable-locallisppath=/Library/Application
 Support/Emacs/${version}/site-lisp:/Library/Application
 Support/Emacs/site-lisp' --with-xwidgets --with-native-compilation
 'CFLAGS=-I/usr/local/opt/gcc/include -I/usr/local/opt/libgccjit/include
 -O2' 'LDFLAGS=-L/usr/local/opt/gcc/lib/gcc/11
 -L/usr/local/opt/gcc/lib/gcc/11/gcc/x86_64-apple-darwin20/11.2.0
 -L/usr/local/opt/libgccjit/lib/gcc/11 -I/usr/local/opt/gcc/include
 -I/usr/local/opt/libgccjit/include -Wl,-headerpad_max_install_names''

Configured features:
ACL DBUS GIF GLIB GMP GNUTLS JPEG JSON LCMS2 LIBXML2 MODULES NATIVE_COMP
NOTIFY KQUEUE NS PDUMPER PNG RSVG THREADS TIFF TOOLKIT_SCROLL_BARS XIM
XWIDGETS ZLIB

Important settings:
  value of $LANG: en_JP.UTF-8
  locale-coding-system: utf-8-unix

Major mode: Org

Minor modes in effect:
  meow-global-mode: t
  meow-mode: t
  meow-normal-mode: t
  helm-adaptive-mode: t
  helm-mode: t
  helm-minibuffer-history-mode: t
  auto-insert-mode: t
  beginend-global-mode: t
  beginend-org-mode: t
  beginend-outline-mode: t
  global-hl-todo-mode: t
  pdf-occur-global-minor-mode: t
  csv-field-index-mode: t
  engine-mode: t
  ws-butler-global-mode: t
  ws-butler-mode: t
  notmuch-bookmarks-mode: t
  persistent-scratch-autosave-mode: t
  rich-minority-mode: t
  direnv-mode: t
  bug-reference-mode: t
  yas-global-mode: t
  yas-minor-mode: t
  global-company-mode: t
  company-mode: t
  global-flycheck-mode: t
  flycheck-mode: t
  treemacs-filewatch-mode: t
  treemacs-follow-mode: t
  treemacs-git-mode: t
  treemacs-fringe-indicator-mode: t
  electric-pair-mode: t
  diredfl-global-mode: t
  helm--remap-mouse-mode: t
  async-bytecomp-package-mode: t
  org-roam-db-autosync-mode: t
  global-git-commit-mode: t
  magit-auto-revert-mode: t
  auto-revert-mode: t
  shell-dirtrack-mode: t
  recentf-mode: t
  global-so-long-mode: t
  minibuffer-depth-indicate-mode: t
  savehist-mode: t
  midnight-mode: t
  global-subword-mode: t
  subword-mode: t
  winner-mode: t
  save-place-mode: t
  global-hl-line-mode: t
  straight-use-package-mode: t
  straight-package-neutering-mode: t
  tooltip-mode: t
  global-eldoc-mode: t
  eldoc-mode: t
  show-paren-mode: t
  electric-indent-mode: t
  mouse-wheel-mode: t
  tab-bar-mode: t
  file-name-shadow-mode: t
  global-font-lock-mode: t
  font-lock-mode: t
  blink-cursor-mode: t
  auto-composition-mode: t
  auto-encryption-mode: t
  auto-compression-mode: t
  line-number-mode: t
  visual-line-mode: t
  transient-mark-mode: t

Load-path shadows:
/Users/kevin/.emacs.d/straight/build/transient/transient hides /Applications/Emacs.app/Contents/Resources/lisp/transient
/Users/kevin/.emacs.d/straight/build/org/ob-exp hides /Applications/Emacs.app/Contents/Resources/lisp/org/ob-exp
/Users/kevin/.emacs.d/straight/build/org/ob-emacs-lisp hides /Applications/Emacs.app/Contents/Resources/lisp/org/ob-emacs-lisp
/Users/kevin/.emacs.d/straight/build/org/oc hides /Applications/Emacs.app/Contents/Resources/lisp/org/oc
/Users/kevin/.emacs.d/straight/build/org/ob-css hides /Applications/Emacs.app/Contents/Resources/lisp/org/ob-css
/Users/kevin/.emacs.d/straight/build/org/ob-lob hides /Applications/Emacs.app/Contents/Resources/lisp/org/ob-lob
/Users/kevin/.emacs.d/straight/build/org/ol-irc hides /Applications/Emacs.app/Contents/Resources/lisp/org/ol-irc
/Users/kevin/.emacs.d/straight/build/org/ob-forth hides /Applications/Emacs.app/Contents/Resources/lisp/org/ob-forth
/Users/kevin/.emacs.d/straight/build/org/org-macs hides /Applications/Emacs.app/Contents/Resources/lisp/org/org-macs
/Users/kevin/.emacs.d/straight/build/org/ob hides /Applications/Emacs.app/Contents/Resources/lisp/org/ob
/Users/kevin/.emacs.d/straight/build/org/org-version hides /Applications/Emacs.app/Contents/Resources/lisp/org/org-version
/Users/kevin/.emacs.d/straight/build/org/ob-scheme hides /Applications/Emacs.app/Contents/Resources/lisp/org/ob-scheme
/Users/kevin/.emacs.d/straight/build/org/ox hides /Applications/Emacs.app/Contents/Resources/lisp/org/ox
/Users/kevin/.emacs.d/straight/build/org/ob-C hides /Applications/Emacs.app/Contents/Resources/lisp/org/ob-C
/Users/kevin/.emacs.d/straight/build/org/org-capture hides /Applications/Emacs.app/Contents/Resources/lisp/org/org-capture
/Users/kevin/.emacs.d/straight/build/org/ob-ref hides /Applications/Emacs.app/Contents/Resources/lisp/org/ob-ref
/Users/kevin/.emacs.d/straight/build/org/ob-clojure hides /Applications/Emacs.app/Contents/Resources/lisp/org/ob-clojure
/Users/kevin/.emacs.d/straight/build/org/org-mouse hides /Applications/Emacs.app/Contents/Resources/lisp/org/org-mouse
/Users/kevin/.emacs.d/straight/build/org/org-ctags hides /Applications/Emacs.app/Contents/Resources/lisp/org/org-ctags
/Users/kevin/.emacs.d/straight/build/org/org-entities hides /Applications/Emacs.app/Contents/Resources/lisp/org/org-entities
/Users/kevin/.emacs.d/straight/build/org/org-archive hides /Applications/Emacs.app/Contents/Resources/lisp/org/org-archive
/Users/kevin/.emacs.d/straight/build/org/ob-screen hides /Applications/Emacs.app/Contents/Resources/lisp/org/ob-screen
/Users/kevin/.emacs.d/straight/build/org/ol-bibtex hides /Applications/Emacs.app/Contents/Resources/lisp/org/ol-bibtex
/Users/kevin/.emacs.d/straight/build/org/ob-haskell hides /Applications/Emacs.app/Contents/Resources/lisp/org/ob-haskell
/Users/kevin/.emacs.d/straight/build/org/org-table hides /Applications/Emacs.app/Contents/Resources/lisp/org/org-table
/Users/kevin/.emacs.d/straight/build/org/ol-eww hides /Applications/Emacs.app/Contents/Resources/lisp/org/ol-eww
/Users/kevin/.emacs.d/straight/build/org/ol-man hides /Applications/Emacs.app/Contents/Resources/lisp/org/ol-man
/Users/kevin/.emacs.d/straight/build/org/ox-org hides /Applications/Emacs.app/Contents/Resources/lisp/org/ox-org
/Users/kevin/.emacs.d/straight/build/org/org-num hides /Applications/Emacs.app/Contents/Resources/lisp/org/org-num
/Users/kevin/.emacs.d/straight/build/org/org-plot hides /Applications/Emacs.app/Contents/Resources/lisp/org/org-plot
/Users/kevin/.emacs.d/straight/build/org/ol-rmail hides /Applications/Emacs.app/Contents/Resources/lisp/org/ol-rmail
/Users/kevin/.emacs.d/straight/build/org/ob-awk hides /Applications/Emacs.app/Contents/Resources/lisp/org/ob-awk
/Users/kevin/.emacs.d/straight/build/org/ob-groovy hides /Applications/Emacs.app/Contents/Resources/lisp/org/ob-groovy
/Users/kevin/.emacs.d/straight/build/org/ob-octave hides /Applications/Emacs.app/Contents/Resources/lisp/org/ob-octave
/Users/kevin/.emacs.d/straight/build/org/org-faces hides /Applications/Emacs.app/Contents/Resources/lisp/org/org-faces
/Users/kevin/.emacs.d/straight/build/org/oc-biblatex hides /Applications/Emacs.app/Contents/Resources/lisp/org/oc-biblatex
/Users/kevin/.emacs.d/straight/build/org/org-colview hides /Applications/Emacs.app/Contents/Resources/lisp/org/org-colview
/Users/kevin/.emacs.d/straight/build/org/ob-R hides /Applications/Emacs.app/Contents/Resources/lisp/org/ob-R
/Users/kevin/.emacs.d/straight/build/org/org-refile hides /Applications/Emacs.app/Contents/Resources/lisp/org/org-refile
/Users/kevin/.emacs.d/straight/build/org/org-timer hides /Applications/Emacs.app/Contents/Resources/lisp/org/org-timer
/Users/kevin/.emacs.d/straight/build/org/org-mobile hides /Applications/Emacs.app/Contents/Resources/lisp/org/org-mobile
/Users/kevin/.emacs.d/straight/build/org/ob-fortran hides /Applications/Emacs.app/Contents/Resources/lisp/org/ob-fortran
/Users/kevin/.emacs.d/straight/build/org/ob-shell hides /Applications/Emacs.app/Contents/Resources/lisp/org/ob-shell
/Users/kevin/.emacs.d/straight/build/org/ob-perl hides /Applications/Emacs.app/Contents/Resources/lisp/org/ob-perl
/Users/kevin/.emacs.d/straight/build/org/ob-sqlite hides /Applications/Emacs.app/Contents/Resources/lisp/org/ob-sqlite
/Users/kevin/.emacs.d/straight/build/org/oc-basic hides /Applications/Emacs.app/Contents/Resources/lisp/org/oc-basic
/Users/kevin/.emacs.d/straight/build/org/ob-sed hides /Applications/Emacs.app/Contents/Resources/lisp/org/ob-sed
/Users/kevin/.emacs.d/straight/build/org/org-list hides /Applications/Emacs.app/Contents/Resources/lisp/org/org-list
/Users/kevin/.emacs.d/straight/build/org/ob-ruby hides /Applications/Emacs.app/Contents/Resources/lisp/org/ob-ruby
/Users/kevin/.emacs.d/straight/build/org/ob-eval hides /Applications/Emacs.app/Contents/Resources/lisp/org/ob-eval
/Users/kevin/.emacs.d/straight/build/org/org-habit hides /Applications/Emacs.app/Contents/Resources/lisp/org/org-habit
/Users/kevin/.emacs.d/straight/build/org/org-clock hides /Applications/Emacs.app/Contents/Resources/lisp/org/org-clock
/Users/kevin/.emacs.d/straight/build/org/org-goto hides /Applications/Emacs.app/Contents/Resources/lisp/org/org-goto
/Users/kevin/.emacs.d/straight/build/org/ox-html hides /Applications/Emacs.app/Contents/Resources/lisp/org/ox-html
/Users/kevin/.emacs.d/straight/build/org/org-src hides /Applications/Emacs.app/Contents/Resources/lisp/org/org-src
/Users/kevin/.emacs.d/straight/build/org/ob-lisp hides /Applications/Emacs.app/Contents/Resources/lisp/org/ob-lisp
/Users/kevin/.emacs.d/straight/build/org/ol-eshell hides /Applications/Emacs.app/Contents/Resources/lisp/org/ol-eshell
/Users/kevin/.emacs.d/straight/build/org/ob-ditaa hides /Applications/Emacs.app/Contents/Resources/lisp/org/ob-ditaa
/Users/kevin/.emacs.d/straight/build/org/org-pcomplete hides /Applications/Emacs.app/Contents/Resources/lisp/org/org-pcomplete
/Users/kevin/.emacs.d/straight/build/org/org-lint hides /Applications/Emacs.app/Contents/Resources/lisp/org/org-lint
/Users/kevin/.emacs.d/straight/build/org/ox-latex hides /Applications/Emacs.app/Contents/Resources/lisp/org/ox-latex
/Users/kevin/.emacs.d/straight/build/org/ob-sass hides /Applications/Emacs.app/Contents/Resources/lisp/org/ob-sass
/Users/kevin/.emacs.d/straight/build/org/ob-tangle hides /Applications/Emacs.app/Contents/Resources/lisp/org/ob-tangle
/Users/kevin/.emacs.d/straight/build/org/ob-calc hides /Applications/Emacs.app/Contents/Resources/lisp/org/ob-calc
/Users/kevin/.emacs.d/straight/build/org/ob-java hides /Applications/Emacs.app/Contents/Resources/lisp/org/ob-java
/Users/kevin/.emacs.d/straight/build/org/ox-icalendar hides /Applications/Emacs.app/Contents/Resources/lisp/org/ox-icalendar
/Users/kevin/.emacs.d/straight/build/org/ol-mhe hides /Applications/Emacs.app/Contents/Resources/lisp/org/ol-mhe
/Users/kevin/.emacs.d/straight/build/org/org-attach-git hides /Applications/Emacs.app/Contents/Resources/lisp/org/org-attach-git
/Users/kevin/.emacs.d/straight/build/org/ox-md hides /Applications/Emacs.app/Contents/Resources/lisp/org/ox-md
/Users/kevin/.emacs.d/straight/build/org/ox-beamer hides /Applications/Emacs.app/Contents/Resources/lisp/org/ox-beamer
/Users/kevin/.emacs.d/straight/build/org/org-element hides /Applications/Emacs.app/Contents/Resources/lisp/org/org-element
/Users/kevin/.emacs.d/straight/build/org/oc-natbib hides /Applications/Emacs.app/Contents/Resources/lisp/org/oc-natbib
/Users/kevin/.emacs.d/straight/build/org/org-protocol hides /Applications/Emacs.app/Contents/Resources/lisp/org/org-protocol
/Users/kevin/.emacs.d/straight/build/org/ob-gnuplot hides /Applications/Emacs.app/Contents/Resources/lisp/org/ob-gnuplot
/Users/kevin/.emacs.d/straight/build/org/org-tempo hides /Applications/Emacs.app/Contents/Resources/lisp/org/org-tempo
/Users/kevin/.emacs.d/straight/build/org/ob-latex hides /Applications/Emacs.app/Contents/Resources/lisp/org/ob-latex
/Users/kevin/.emacs.d/straight/build/org/ol-w3m hides /Applications/Emacs.app/Contents/Resources/lisp/org/ol-w3m
/Users/kevin/.emacs.d/straight/build/org/org-id hides /Applications/Emacs.app/Contents/Resources/lisp/org/org-id
/Users/kevin/.emacs.d/straight/build/org/ox-man hides /Applications/Emacs.app/Contents/Resources/lisp/org/ox-man
/Users/kevin/.emacs.d/straight/build/org/ol-doi hides /Applications/Emacs.app/Contents/Resources/lisp/org/ol-doi
/Users/kevin/.emacs.d/straight/build/org/org-feed hides /Applications/Emacs.app/Contents/Resources/lisp/org/org-feed
/Users/kevin/.emacs.d/straight/build/org/ob-julia hides /Applications/Emacs.app/Contents/Resources/lisp/org/ob-julia
/Users/kevin/.emacs.d/straight/build/org/ob-lua hides /Applications/Emacs.app/Contents/Resources/lisp/org/ob-lua
/Users/kevin/.emacs.d/straight/build/org/ob-table hides /Applications/Emacs.app/Contents/Resources/lisp/org/ob-table
/Users/kevin/.emacs.d/straight/build/org/ob-ocaml hides /Applications/Emacs.app/Contents/Resources/lisp/org/ob-ocaml
/Users/kevin/.emacs.d/straight/build/org/oc-csl hides /Applications/Emacs.app/Contents/Resources/lisp/org/oc-csl
/Users/kevin/.emacs.d/straight/build/org/ol-gnus hides /Applications/Emacs.app/Contents/Resources/lisp/org/ol-gnus
/Users/kevin/.emacs.d/straight/build/org/org-indent hides /Applications/Emacs.app/Contents/Resources/lisp/org/org-indent
/Users/kevin/.emacs.d/straight/build/org/ob-lilypond hides /Applications/Emacs.app/Contents/Resources/lisp/org/ob-lilypond
/Users/kevin/.emacs.d/straight/build/org/ob-matlab hides /Applications/Emacs.app/Contents/Resources/lisp/org/ob-matlab
/Users/kevin/.emacs.d/straight/build/org/org-datetree hides /Applications/Emacs.app/Contents/Resources/lisp/org/org-datetree
/Users/kevin/.emacs.d/straight/build/org/ol-docview hides /Applications/Emacs.app/Contents/Resources/lisp/org/ol-docview
/Users/kevin/.emacs.d/straight/build/org/ob-python hides /Applications/Emacs.app/Contents/Resources/lisp/org/ob-python
/Users/kevin/.emacs.d/straight/build/org/ob-makefile hides /Applications/Emacs.app/Contents/Resources/lisp/org/ob-makefile
/Users/kevin/.emacs.d/straight/build/org/org-duration hides /Applications/Emacs.app/Contents/Resources/lisp/org/org-duration
/Users/kevin/.emacs.d/straight/build/org/org-agenda hides /Applications/Emacs.app/Contents/Resources/lisp/org/org-agenda
/Users/kevin/.emacs.d/straight/build/org/ob-dot hides /Applications/Emacs.app/Contents/Resources/lisp/org/ob-dot
/Users/kevin/.emacs.d/straight/build/org/ob-js hides /Applications/Emacs.app/Contents/Resources/lisp/org/ob-js
/Users/kevin/.emacs.d/straight/build/org/ox-publish hides /Applications/Emacs.app/Contents/Resources/lisp/org/ox-publish
/Users/kevin/.emacs.d/straight/build/org/org-inlinetask hides /Applications/Emacs.app/Contents/Resources/lisp/org/org-inlinetask
/Users/kevin/.emacs.d/straight/build/org/ob-org hides /Applications/Emacs.app/Contents/Resources/lisp/org/ob-org
/Users/kevin/.emacs.d/straight/build/org/org-keys hides /Applications/Emacs.app/Contents/Resources/lisp/org/org-keys
/Users/kevin/.emacs.d/straight/build/org/ob-core hides /Applications/Emacs.app/Contents/Resources/lisp/org/ob-core
/Users/kevin/.emacs.d/straight/build/org/org-compat hides /Applications/Emacs.app/Contents/Resources/lisp/org/org-compat
/Users/kevin/.emacs.d/straight/build/org/ol hides /Applications/Emacs.app/Contents/Resources/lisp/org/ol
/Users/kevin/.emacs.d/straight/build/org/ox-odt hides /Applications/Emacs.app/Contents/Resources/lisp/org/ox-odt
/Users/kevin/.emacs.d/straight/build/org/ol-info hides /Applications/Emacs.app/Contents/Resources/lisp/org/ol-info
/Users/kevin/.emacs.d/straight/build/org/ob-plantuml hides /Applications/Emacs.app/Contents/Resources/lisp/org/ob-plantuml
/Users/kevin/.emacs.d/straight/build/org/ob-eshell hides /Applications/Emacs.app/Contents/Resources/lisp/org/ob-eshell
/Users/kevin/.emacs.d/straight/build/org/ox-ascii hides /Applications/Emacs.app/Contents/Resources/lisp/org/ox-ascii
/Users/kevin/.emacs.d/straight/build/org/org-loaddefs hides /Applications/Emacs.app/Contents/Resources/lisp/org/org-loaddefs
/Users/kevin/.emacs.d/straight/build/org/ox-koma-letter hides /Applications/Emacs.app/Contents/Resources/lisp/org/ox-koma-letter
/Users/kevin/.emacs.d/straight/build/org/ob-maxima hides /Applications/Emacs.app/Contents/Resources/lisp/org/ob-maxima
/Users/kevin/.emacs.d/straight/build/org/org hides /Applications/Emacs.app/Contents/Resources/lisp/org/org
/Users/kevin/.emacs.d/straight/build/org/ol-bbdb hides /Applications/Emacs.app/Contents/Resources/lisp/org/ol-bbdb
/Users/kevin/.emacs.d/straight/build/org/org-macro hides /Applications/Emacs.app/Contents/Resources/lisp/org/org-macro
/Users/kevin/.emacs.d/straight/build/org/ob-sql hides /Applications/Emacs.app/Contents/Resources/lisp/org/ob-sql
/Users/kevin/.emacs.d/straight/build/org/org-attach hides /Applications/Emacs.app/Contents/Resources/lisp/org/org-attach
/Users/kevin/.emacs.d/straight/build/org/ob-processing hides /Applications/Emacs.app/Contents/Resources/lisp/org/ob-processing
/Users/kevin/.emacs.d/straight/build/org/ox-texinfo hides /Applications/Emacs.app/Contents/Resources/lisp/org/ox-texinfo
/Users/kevin/.emacs.d/straight/build/org/org-crypt hides /Applications/Emacs.app/Contents/Resources/lisp/org/org-crypt
/Users/kevin/.emacs.d/straight/build/org/org-footnote hides /Applications/Emacs.app/Contents/Resources/lisp/org/org-footnote
/Users/kevin/.emacs.d/straight/build/org/org-install hides /Applications/Emacs.app/Contents/Resources/lisp/org/org-install
/Users/kevin/.emacs.d/straight/build/org/ob-comint hides /Applications/Emacs.app/Contents/Resources/lisp/org/ob-comint
/Users/kevin/.emacs.d/straight/build/let-alist/let-alist hides /Applications/Emacs.app/Contents/Resources/lisp/emacs-lisp/let-alist

Features:
(shadow mail-extr emacsbug sendmail cl-print shortdoc image-file
image-converter helm-command helm-elisp helm-eval cus-start magit-patch
magit-subtree magit-extras magit-gitignore magit-ediff ediff ediff-merg
ediff-mult ediff-wind ediff-diff ediff-help ediff-init ediff-util
org-eldoc tramp-archive tramp-gvfs helm-x-files vc-mtn vc-hg vc-bzr
vc-src vc-sccs vc-svn vc-cvs vc-rcs vc company-files company-yasnippet
company-keywords make-mode company-dabbrev-code company-dabbrev
company-capf modus-vivendi-theme modus-operandi-theme modus-themes
modus-themes-autoloads general general-autoloads meow meow-tutor
meow-cheatsheet meow-cheatsheet-layout meow-core meow-shims delsel
meow-esc meow-command array meow-beacon meow-thing meow-visual
meow-keypad meow-helpers meow-util meow-keymap meow-face meow-var
meow-autoloads org-alert org-alert-autoloads olivetti olivetti-autoloads
rainbow-mode rainbow-mode-autoloads goto-chg goto-chg-autoloads
sqlformat reformatter sqlformat-autoloads reformatter-autoloads
helm-xref helm-xref-autoloads helm-for-files helm-bookmark helm-info
helm-external helm-net helm-adaptive helm-mode helm-misc helm-files
image-dired dired-x dired-aux helm-buffers helm-occur helm-tags
helm-locate helm-grep helm-regexp helm-utils helm-help helm-types
memoize memoize-autoloads autoinsert xterm-color xterm-color-autoloads
deadgrep deadgrep-autoloads visual-regexp-steroids-autoloads pcre2el rxt
re-builder pcre2el-autoloads visual-regexp visual-regexp-autoloads
git-modes gitignore-mode gitconfig-mode conf-mode gitattributes-mode
git-modes-autoloads ktf-redmine elmine elmine-autoloads vlf-setup vlf
vlf-base vlf-tune vlf-autoloads beginend beginend-autoloads turbo-log
turbo-log-autoloads grugru grugru-autoloads hydra helpful trace edebug
backtrace info-look help-fns radix-tree elisp-refs helpful-autoloads
elisp-refs-autoloads grip-mode grip-mode-autoloads kill-or-bury-alive
kill-or-bury-alive-autoloads verb verb-autoloads w3m-form w3m timezone
w3m-hist w3m-fb bookmark-w3m w3m-ems w3m-favicon w3m-image tab-line
w3m-proc w3m-util w3m-load w3m-autoloads hl-todo hl-todo-autoloads
scratch scratch-autoloads crux crux-autoloads pdf-occur pdf-isearch
pdf-misc pdf-tools cus-edit cus-load pdf-view pdf-cache pdf-info tq
pdf-util pdf-macs pdf-tools-autoloads csv-mode sort csv-mode-autoloads
copy-as-format tabify copy-as-format-autoloads cloudformation cw
json-reformat json-reformat-autoloads awc prodigy prodigy-autoloads
engine-mode engine-mode-autoloads sqlup-mode sql sqlup-mode-autoloads
transpose-frame transpose-frame-autoloads ws-butler ws-butler-autoloads
string-inflection string-inflection-autoloads notmuch-bookmarks
notmuch-bookmarks-autoloads notmuch notmuch-tree notmuch-jump
notmuch-hello notmuch-show notmuch-print notmuch-crypto notmuch-mua
notmuch-message notmuch-draft notmuch-maildir-fcc notmuch-address
notmuch-company notmuch-parser notmuch-wash coolj notmuch-query
icalendar diary-lib diary-loaddefs notmuch-tag notmuch-lib
notmuch-compat notmuch-autoloads persistent-scratch
persistent-scratch-autoloads dockerfile-mode sh-script smie executable
dockerfile-mode-autoloads docker docker-volume docker-network
docker-image docker-container docker-faces docker-compose docker-utils
json-mode json-snatcher js docker-core tablist tablist-filter
semantic/wisent/comp semantic/wisent semantic/wisent/wisent
semantic/util-modes semantic/util semantic semantic/tag semantic/lex
semantic/fw mode-local cedet docker-autoloads tablist-autoloads
json-mode-autoloads json-snatcher-autoloads docker-tramp-autoloads
docker-tramp tramp-cache rich-minority rich-minority-autoloads direnv
direnv-autoloads run-command run-command-autoloads git-timemachine
git-timemachine-autoloads pr-review pr-review-render pr-review-action
pr-review-input pr-review-api pr-review-common pr-review-autoloads
code-review code-review-comment code-review-section eieio-compat emojify
apropos tar-mode arc-mode archive-mode code-review-gitlab
code-review-utils code-review-github code-review-db uuidgen calc-misc
calc-ext calc calc-loaddefs calc-macs a code-review-core forge-list
forge-commands forge-semi forge-bitbucket buck forge-gogs gogs
forge-gitea gtea forge-gitlab glab forge-github forge-notify
forge-revnote forge-pullreq forge-issue forge-topic yaml bug-reference
forge-post forge-repo forge forge-core forge-db ghub-graphql treepy
gsexp ghub gnutls closql code-review-autoloads emojify-autoloads
uuidgen-autoloads a-autoloads forge-autoloads yaml-autoloads
ghub-autoloads treepy-autoloads closql-autoloads git-link
git-link-autoloads magit-gitflow magit-popup magit-gitflow-autoloads
magit-popup-autoloads yasnippet yasnippet-autoloads company
company-autoloads vterm treemacs-bookmarks magit-bookmark bookmark pp
face-remap vterm-module term/xterm xterm vterm-autoloads project-x
project-x-autoloads smart-jump-typescript-mode smart-jump-python
smart-jump-lisp-mode smart-jump-elisp-mode smart-jump-cc-mode smart-jump
smart-jump-autoloads dumb-jump popup dumb-jump-autoloads flycheck
let-alist flycheck-autoloads let-alist-autoloads pkg-info-autoloads
epl-autoloads use-package-ensure lsp-pyright lsp-pyright-autoloads
dap-java lsp-java lsp-java-autoloads lsp-metals view lsp-metals-treeview
lsp-treemacs lsp-treemacs-themes treemacs treemacs-header-line
treemacs-compatibility treemacs-mode treemacs-interface
treemacs-extensions treemacs-mouse-interface treemacs-tags
treemacs-persistence treemacs-filewatch-mode treemacs-follow-mode
treemacs-rendering treemacs-async treemacs-workspaces treemacs-dom
treemacs-visuals treemacs-fringe-indicator treemacs-scope pulse
treemacs-faces treemacs-icons treemacs-themes treemacs-core-utils
pfuture treemacs-logging treemacs-customization treemacs-macros
lsp-metals-protocol lsp-lens dap-mode dap-launch posframe dap-overlays
lsp-metals-autoloads dap-mode-autoloads bui-autoloads
lsp-treemacs-autoloads treemacs-autoloads cfrs-autoloads
posframe-autoloads hydra-autoloads pfuture-autoloads
ace-window-autoloads lsp-mode lsp-protocol xref project spinner
network-stream markdown-mode color lv ht ewoc lsp-mode-autoloads
lv-autoloads markdown-mode-autoloads spinner-autoloads ht-autoloads
lua-mode lua-mode-autoloads python-pytest projectile skeleton ibuf-macs
elec-pair find-dired lisp-mnt python tramp-sh tramp tramp-loaddefs
trampver tramp-integration files-x tramp-compat ls-lisp
python-pytest-autoloads projectile-autoloads yaml-mode
yaml-mode-autoloads terraform-mode hcl-mode terraform-mode-autoloads
hcl-mode-autoloads sbt-mode-autoloads scala-mode
scala-mode-prettify-symbols scala-mode-imenu scala-mode-map
scala-mode-fontlock scala-mode-indent scala-mode-paragraph
scala-mode-syntax scala-mode-lib scala-mode-autoloads typescript-mode
cc-mode cc-fonts cc-guess cc-menus cc-cmds cc-styles cc-align cc-engine
cc-vars cc-defs typescript-mode-autoloads link-hint ffap goto-addr
link-hint-autoloads avy avy-autoloads plus-minus rect
plus-minus-autoloads wgrep-deadgrep wgrep grep compile wgrep-autoloads
ibuf-ext ibuffer ibuffer-loaddefs diredfl diredfl-autoloads
dired-subtree dired-hacks-utils dired-subtree-autoloads
dired-hacks-utils-autoloads helm-pass helm async-bytecomp
helm-global-bindings helm-easymenu helm-source helm-multi-match helm-lib
async helm-pass-autoloads helm-autoloads helm-core-autoloads
popup-autoloads async-autoloads password-store auth-source-pass
password-store-autoloads pinentry pinentry-autoloads
exec-path-from-shell exec-path-from-shell-autoloads calfw-org org-agenda
calfw-org-autoloads calfw cl calfw-autoloads japanese-holidays holidays
hol-loaddefs japanese-holidays-autoloads org-gcal persist org-generic-id
org-clock org-archive request-deferred deferred request alert log4e
notifications gntp org-gcal-autoloads persist-autoloads alert-autoloads
finder-inf log4e-autoloads gntp-autoloads request-deferred-autoloads
deferred-autoloads request-autoloads org-roam-migrate org-roam-mode
inline org-roam-capture org-roam-node org-roam-db org-roam-utils
org-roam-compat org-roam org-capture org-element org-persist avl-tree
generator org-id org-refile emacsql-sqlite url-http url-auth url-gw nsm
emacsql emacsql-compiler f org-roam-autoloads emacsql-sqlite-autoloads
emacsql-autoloads f-autoloads orgit-autoloads orgit magit-submodule
magit-obsolete magit-blame magit-stash magit-reflog magit-bisect
magit-push magit-pull magit-fetch magit-clone magit-remote magit-commit
magit-sequence magit-notes magit-worktree magit-tag magit-merge
magit-branch magit-reset magit-files magit-refs magit-status magit
package url-handlers magit-repos magit-apply magit-wip magit-log
magit-diff smerge-mode diff git-commit log-edit pcvs-util add-log
magit-core magit-autorevert autorevert filenotify magit-margin
magit-transient magit-process with-editor term disp-table ehelp eshell
esh-cmd esh-ext esh-opt esh-proc esh-io esh-arg esh-module esh-groups
esh-util server magit-mode transient magit-git magit-section comp
comp-cstr warnings benchmark magit-utils which-func imenu vc-git
diff-mode vc-dispatcher ido crm magit-autoloads magit-section-autoloads
git-commit-autoloads with-editor-autoloads transient-autoloads ob-shell
shell ob-sql ol-git-link ol-notmuch org-mac-link ol-eww eww xdg
url-queue thingatpt mm-url ol-rmail ol-mhe ol-irc ol-info ol-gnus
nnselect gnus-search eieio-opt speedbar ezimage dframe gnus-art mm-uu
mml2015 mm-view mml-smime smime dig ol-docview doc-view jka-compr
image-mode exif ol-bibtex ol-bbdb ol-w3m ol-doi org-link-doi org ob
ob-tangle ob-ref ob-lob ob-table ob-exp org-macro org-footnote org-src
ob-comint org-pcomplete pcomplete comint ansi-color org-list org-faces
org-entities noutline outline org-version ob-emacs-lisp ob-core ob-eval
org-table oc-basic bibtex ol org-keys oc org-compat advice org-macs
pcase org-loaddefs format-spec find-func cal-menu calendar cal-loaddefs
gnus-sum shr kinsoku svg dom browse-url url url-proxy url-privacy
url-expand url-methods url-history url-cookie url-domsuf url-util
url-parse url-vars mailcap gnus-group gnus-undo gnus-start gnus-dbus
dbus xml gnus-cloud nnimap nnmail mail-source utf7 netrc nnoo parse-time
iso8601 gnus-spec gnus-int gnus-range message rmc puny dired
dired-loaddefs rfc822 mml mml-sec epa epg rfc6068 epg-config mm-decode
mm-bodies mm-encode mail-parse rfc2231 mailabbrev gmm-utils mailheader
gnus-win gnus nnheader gnus-util rmail rmail-loaddefs auth-source eieio
eieio-core eieio-loaddefs password-cache json map rfc2047 rfc2045
ietf-drums text-property-search time-date mail-utils mm-util mail-prsvr
org-contrib-autoloads recentf tree-widget wid-edit so-long japan-util
edmacro kmacro mb-depth savehist midnight cap-words superword subword
winner ring saveplace hl-line s s-autoloads dash easy-mmode rx
dash-autoloads use-package-core derived use-package-autoloads
bind-key-autoloads straight-autoloads info cl-seq cl-extra help-mode seq
byte-opt straight subr-x cl-macs gv cl-loaddefs cl-lib bytecomp
byte-compile cconv iso-transl tooltip eldoc paren electric uniquify
ediff-hook vc-hooks lisp-float-type elisp-mode mwheel term/ns-win ns-win
ucs-normalize mule-util term/common-win tool-bar dnd fontset image
regexp-opt fringe tabulated-list replace newcomment text-mode lisp-mode
prog-mode register page tab-bar menu-bar rfn-eshadow isearch easymenu
timer select scroll-bar mouse jit-lock font-lock syntax font-core
term/tty-colors frame minibuffer cl-generic cham georgian utf-8-lang
misc-lang vietnamese tibetan thai tai-viet lao korean japanese eucjp-ms
cp51932 hebrew greek romanian slovak czech european ethiopic indian
cyrillic chinese composite emoji-zwj charscript charprop case-table
epa-hook jka-cmpr-hook help simple abbrev obarray cl-preloaded nadvice
button loaddefs faces cus-face macroexp files window text-properties
overlay sha1 md5 base64 format env code-pages mule custom widget
hashtable-print-readable backquote threads xwidget-internal dbusbind
kqueue cocoa ns lcms2 multi-tty make-network-process native-compile
emacs)

Memory information:
((conses 16 2836393 2070064)
 (symbols 48 104623 42)
 (strings 32 293047 147494)
 (string-bytes 1 11826453)
 (vectors 16 127745)
 (vector-slots 8 2224426 908113)
 (floats 8 947 1907)
 (intervals 56 11003 6280)
 (buffers 992 59))

bug#52504: 28.0.90; Ediff control buffer not fully resized

[Eli Zaretskii]

> From: Kevin Fleming <kvnflm@gmail.com>
> Date: Wed, 15 Dec 2021 19:29:05 +0900
> 
> When running ediff in a terminal (reproducible with emacs -Q -nw), or in
> a GUI with (setq ediff-window-setup-function 'ediff-setup-windows-plain),
> pressing the ? key only increases the size of the control buffer's
> window by 2 lines, not enough to display the full help text. Using git
> bisect suggests that this started happening with this commit on the
> emacs-28 branch:
> 
> [f26a027d6b8e0b894d5d28c446643d411b376ea9] Fix ediff3 layouts with window-combination-resize non-nil (Bug#49277)

Martin, could you please take a look?  If this is a regression, I'd
like to have it fixed on the emacs-28 branch.

Thanks.

bug#52504: 28.0.90; Ediff control buffer not fully resized

[martin rudalics]

 > Martin, could you please take a look?  If this is a regression, I'd
 > like to have it fixed on the emacs-28 branch.

It is a regression I tried to fix on the emacs-28 branch.

martin

bug#52504: 28.0.90; Ediff control buffer not fully resized

[Eli Zaretskii]

> Cc: 52504@debbugs.gnu.org
> From: martin rudalics <rudalics@gmx.at>
> Date: Wed, 15 Dec 2021 18:58:12 +0100
> 
>  > Martin, could you please take a look?  If this is a regression, I'd
>  > like to have it fixed on the emacs-28 branch.
> 
> It is a regression I tried to fix on the emacs-28 branch.

Thanks.

bug#52504: 28.0.90; Ediff control buffer not fully resized

[Kevin Fleming]

>  > Martin, could you please take a look?  If this is a regression, I'd
>  > like to have it fixed on the emacs-28 branch.
>
> It is a regression I tried to fix on the emacs-28 branch.

I can confirm that it appears to be fixed on the latest emacs-28. Thank you!

bug#52504: 28.0.90; Ediff control buffer not fully resized

[Eli Zaretskii]

> From: Kevin Fleming <kvnflm@gmail.com>
> Cc: 52504@debbugs.gnu.org
> Date: Thu, 16 Dec 2021 08:52:08 +0900
> 
> >  > Martin, could you please take a look?  If this is a regression, I'd
> >  > like to have it fixed on the emacs-28 branch.
> >
> > It is a regression I tried to fix on the emacs-28 branch.
> 
> I can confirm that it appears to be fixed on the latest emacs-28. Thank you!

Thanks for testing, I'm therefore closing this bug.