bgarrigues pushed a commit to branch master
in repository groff.

commit ffb05e28da383eb3c42fd858189e950073d957be
Author: Bjarni Ingi Gislason <[email protected]>
Date:   Fri Jul 14 13:34:57 2017 +0000

    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 0ff53fe..063b5d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2017-08-25  Bjarni Ingi Gislason <[email protected]>
 
+       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 <[email protected]>
+
        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 2c82c56..f242d4e 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)

_______________________________________________
Groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit

Reply via email to