New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Merge pull request #452 from LemonBoy/terminfo-cup" #737

Merged
merged 1 commit into from Aug 10, 2017

Conversation

Projects
None yet
2 participants
@ailin-nemui
Contributor

ailin-nemui commented Aug 7, 2017

Fixes #733. The fix outlined in #452 had adverse effects for the
following reason. The code removed the restoration path that would go on
the code path from kill SIGTSTP. The problem is this: When Irssi is not
running in a controlling parent (like a shell), the TSTP will in fact be
ignored. In that case, there is no process sending a CONT either and
thus the screen state never gets restored. Luckily, the patch in #457 is
sufficient to prevent the problem in #450 (which lead to the development
of #452). To that end, we do end up with potentially calling
terminfo_cont twice but that is better than not calling it at all.

This reverts commit b1ffd5f, reversing
changes made to 9cb0419.

Revert "Merge pull request #452 from LemonBoy/terminfo-cup"
Fixes #733. The fix outlined in #452 had adverse effects for the
following reason. The code removed the restoration path that would go on
the code path from kill SIGTSTP. The problem is this: When Irssi is not
running in a controlling parent (like a shell), the TSTP will in fact be
ignored. In that case, there is no process sending a CONT either and
thus the screen state never gets restored. Luckily, the patch in #457 is
sufficient to prevent the problem in #450 (which lead to the development
of #452). To that end, we do end up with potentially calling
terminfo_cont twice but that is better than not calling it at all.

This reverts commit b1ffd5f, reversing
changes made to 9cb0419.
@dequis

This comment has been minimized.

Member

dequis commented Aug 7, 2017

reversing changes made to 9cb0419

What?

@ailin-nemui

This comment has been minimized.

Contributor

ailin-nemui commented Aug 7, 2017

uh idk git autocreated that message o_O. I think what it meant by that is that 0cb0419 is the "main" parent of the reverted commit, most closely corresponding to the master branch at that time

@dequis

This comment has been minimized.

Member

dequis commented Aug 7, 2017

Oh, because you reverted a merge commit with two heads. Makes sense now. Kinda confusing to have it there though

@ailin-nemui ailin-nemui merged commit 1347101 into irssi:master Aug 10, 2017

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@ailin-nemui ailin-nemui deleted the ailin-nemui:fix-733 branch Aug 10, 2017

ailin-nemui added a commit to ailin-nemui/irssi that referenced this pull request Dec 7, 2017

Merge pull request irssi#737 from ailin-nemui/fix-733
Revert "Merge pull request irssi#452 from LemonBoy/terminfo-cup"

@ailin-nemui ailin-nemui added this to the 1.0.5 milestone Jan 10, 2018

lkundrak pushed a commit to lkundrak/irssi that referenced this pull request Feb 16, 2018

Merge pull request irssi#737 from ailin-nemui/fix-733
Revert "Merge pull request irssi#452 from LemonBoy/terminfo-cup"

(cherry picked from commit 1347101)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment