From ffb05e28da383eb3c42fd858189e950073d957be Mon Sep 17 00:00:00 2001 From: Bjarni Ingi Gislason Date: Fri, 14 Jul 2017 13:34:57 +0000 Subject: Fix bug: `.itc' request breaks subsequent `.it' requests. See bug at: https://savannah.gnu.org/bugs/?51376. Using `.itc' lets all later uses of `.it' behave like `.itc', that is, interrupted text line ending with \c is not counted as a separate line. * env.cpp: Restore input_trap state to normal when '.it' is called. --- ChangeLog | 12 ++++++++++++ src/roff/troff/env.cpp | 2 ++ 2 files changed, 14 insertions(+) diff --git a/ChangeLog b/ChangeLog index 0ff53fefd..063b5d24b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2017-08-25 Bjarni Ingi Gislason + + Fix bug: `.itc' request breaks subsequent `.it' requests. + + See bug at: https://savannah.gnu.org/bugs/?51376. Using `.itc' + lets all later uses of `.it' behave like `.itc', that is, + interrupted text line ending with \c is not counted as a separate + line. + + * env.cpp: Restore input_trap state to normal when '.it' is + called. + 2017-08-25 Bjarni Ingi Gislason Fix a part of a virtual (pseudo) structure in "tty.tmac". diff --git a/src/roff/troff/env.cpp b/src/roff/troff/env.cpp index 2c82c5683..f242d4ee4 100644 --- a/src/roff/troff/env.cpp +++ b/src/roff/troff/env.cpp @@ -2508,6 +2508,8 @@ void do_input_trap(int continued) curenv->input_trap_count = 0; if (continued) curenv->continued_input_trap = 1; + else + curenv->continued_input_trap = 0; int n; if (has_arg() && get_integer(&n)) { if (n <= 0) -- cgit v1.2.1