This series reimplements a problematic series that was partially reverted in 2.34.1, but addressing all raised concerns and being a lot more conservative. The first commit addresses directly the issue reported and that required the revert, but punts several changes to future series to make sure it is safe enough for backporting into maint if needed, it also tries (probably too hard) to not introduce any behaviour changes, so it might seem "incomplete", but expect further changes that will clean it up further. The the second one is taken from a draft[1] and is ammended by the third, hence why this is all still an RFC. Carlo Marcelo Arenas Belón (2): terminal: teach save_term to fail when not foreground fixup! editor: allow for saving/restoring terminal state Junio C Hamano (1): editor: allow for saving/restoring terminal state Documentation/config.txt | 2 ++ Documentation/config/editor.txt | 8 ++++++++ compat/terminal.c | 17 ++++++++++++++++- editor.c | 22 ++++++++++++++++++++-- 4 files changed, 46 insertions(+), 3 deletions(-) create mode 100644 Documentation/config/editor.txt [1] https://lore.kernel.org/git/xmqq7dcnyh5o.fsf@gitster.g/ -- 2.34.1.460.g364565cfab