diff options
| author | Bjarni Ingi Gislason <bjarniig@rhi.hi.is> | 2017-07-14 13:34:57 +0000 |
|---|---|---|
| committer | Bertrand Garrigues <bertrand.garrigues@laposte.net> | 2017-08-26 00:12:40 +0200 |
| commit | ffb05e28da383eb3c42fd858189e950073d957be (patch) | |
| tree | f9d7cf9cc241d9b1f6749baffbb40c5e4785308e | |
| parent | 344cbb440580d6dedc36fccc717ff4294fe13fae (diff) | |
| download | groff-git-ffb05e28da383eb3c42fd858189e950073d957be.tar.gz | |
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.
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | src/roff/troff/env.cpp | 2 |
2 files changed, 14 insertions, 0 deletions
@@ -1,5 +1,17 @@ 2017-08-25 Bjarni Ingi Gislason <bjarniig@rhi.hi.is> + 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 <bjarniig@rhi.hi.is> + Fix a part of a virtual (pseudo) structure in "tty.tmac". * tmac/tty.tmac: Fix warning: ".../git/groff/tmac/tty.tmac:19: 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) |