lib-renderline: fix handling of truncation.

When looking for a bug in wrap-mode I found this bug in non-wrap mode.
But I cannot reproduce the first bug any more.
Weird.

Signed-off-by: NeilBrown <neil@brown.name>

diff --git a/DOC/TODO.md b/DOC/TODO.md
index 24f7dbe7c3fe28265a7968beb3de854ea7258eff..0485dbc63f3c75e8c89f481225aebef730c1a478 100644 (file)
--- a/DOC/TODO.md
+++ b/DOC/TODO.md
@@ -9,6 +9,10 @@ the file.
 
 ### Triage
 
+- [ ] How to run shell command in "44" window??
+- [X] In c-mode, if ) is at end of line then highlighting it causes the
+      line to wrap
+- [ ] mail compose should refuse to submit email with no valid 'to' address
 - [X] If a pane with shift-disabled has cursor past the right edge, the
       cursor gets positioned outside the window
 - [X] when find-file dialog shifts left, it doesn't shift back until

diff --git a/lib-renderline.c b/lib-renderline.c
index 39a069ee9136c40c10b8094355d84b7ea9a3d9bb..73903e2a3a6dac54b2f108dec3fa5617421e40e4 100644 (file)
--- a/lib-renderline.c
+++ b/lib-renderline.c
@@ -811,7 +811,7 @@ DEF_CMD(renderline)
                        }
                }
 
-               if ((ret == WRAP || x >= p->w - mwidth) &&
+               if ((ret == WRAP || x >= p->w - (wrap ? mwidth : 0)) &&
                    line[0] != soh && line[0] != ack) {
                        /* No room for more text */
                        if (wrap && *line && *line != '\n') {

diff --git a/tests.d/00-mouse b/tests.d/00-mouse
index 50a896da31f94d7968af658fcb14862833351ab6..83210f19d00b0fb904c6a7d1bf0cfe80a37a42f5 100644 (file)
--- a/tests.d/00-mouse
+++ b/tests.d/00-mouse
@@ -32,7 +32,7 @@ Mouse ":Release-1" 65,22
 Mouse ":Press-1" 60,11
 Display 80,30 45A837A48E0E7247225714259D1EFEB5 60,11
 Mouse ":Release-1" 60,20
-Display 80,30 50235A2F60095AF7A9160E118743583F 60,20
+Display 80,30 DC2DBB157C5F70CF7697A6DC9756A18A 60,20
 Mouse ":Press-1" 17,7
 Display 80,30 E2BACFD27BAA568D4EF2D374F67BEC7C 17,7
 Mouse ":Release-1" 17,20

diff --git a/tests.d/02-presenter b/tests.d/02-presenter
index 5b599c8c2842224aefb20ce455aba9be172903fc..c978f4049f0230c08b47ec721d095ae74a9059df 100644 (file)
--- a/tests.d/02-presenter
+++ b/tests.d/02-presenter
@@ -136,11 +136,11 @@ Display 80,30 E0A69C1E363A1D8CF0CE1AA05735C481 41,19
 Key ":C-V"
 Display 80,30 E5E5878F3C35BBC0FFA401E21CCA6ABD 41,25
 Key ":C-V"
-Display 80,30 880BB70FA320DB38D6A1F6A17BE1BBFF 41,19
+Display 80,30 DF03F982239B244DF7B5FB10905285B4 41,19
 Key ":C-V"
 Display 80,30 55E7EC6F1D0014C43AAB7828596A1BB8 41,25
 Key ":C-V"
-Display 80,30 F377B6AE12DD1574E59B1017C2C02966 41,22
+Display 80,30 9ECA7E35D33B134B88EDAAA3A8338023 41,22
 Key ":C-V"
 Display 80,30 F8A564286C888DC61BC395F62DB042EB 41,20
 Key ":C-V"
@@ -148,15 +148,15 @@ Display 80,30 FFCA69CDF55210CC65B619E899D1C5BF 41,27
 Key ":A-v"
 Display 80,30 9589B1C03AA99BF093F1EDEEEC0D9ABF 41,19
 Key ":A-v"
-Display 80,30 C035AD94405AEC3A44B02667E74E27FA 41,4
+Display 80,30 A19BD46360452DC4F76D6AB759BAA183 41,4
 Key ":A-v"
 Display 80,30 C799603795FEB053D3ADC12DD1670719 41,2
 Key ":A-v"
-Display 80,30 72E3DCDB5CD5DB5BBC4EC6C7237EED4C 41,5
+Display 80,30 5E53C13757151F7B0DCCB45C6C65C374 41,5
 Key ":C-X"
-Display 80,30 BA638330EBD654C22A685C3F3A49A19E 41,5
+Display 80,30 60C41C8C1C19F65E250F30793DF7BE17 41,5
 Key "-o"
-Display 80,30 72E3DCDB5CD5DB5BBC4EC6C7237EED4C 41,5
+Display 80,30 5E53C13757151F7B0DCCB45C6C65C374 41,5
 Key "- "
 Display 80,30 BE242D1AD3966DCC594BF09FB6C6AC3F 41,5
 Key "- "
@@ -200,13 +200,13 @@ Display 80,30 C9D6282555D99B0A5D8F0DAA5FE4AA4A 72,0
 Key ":Enter"
 Display 80,30 E19B9CF9BCAEA829CFF96E0D3FC9577E 52,21
 Key ":C-V"
-Display 80,30 6BAAB3CCA36D07BA7F26C79FD0415A90 41,25
+Display 80,30 ED2E295E6E117CABD58C5B4326A43983 41,25
 Key ":C-V"
-Display 80,30 E36D37236C4943849BDFB4BEA278055C 41,20
+Display 80,30 3D925A69F8AB928F3A25928154812E1A 41,20
 Key ":A->"
-Display 80,30 66BEDF3A794BB6BDE704DFF3A58CBD57 41,25
+Display 80,30 2395F82FA62C2F0EA7BACB1CD10EB75A 41,25
 Key ":C-L"
-Display 80,30 1CE973C2ABB7156F1CA180C37F35AD86 41,25
+Display 80,30 8E9C0BB1F594CB325AE7083ADB09DCF5 41,25
 Key ":A-v"
 Display 80,30 1D01CD6F5882A920FA950B64648868B1 41,2
 Key ":C-P"
@@ -216,9 +216,9 @@ Display 80,30 43AAFD0E7799B8A170552941FCFFC6FA 41,0
 Key ":C-P"
 Display 80,30 F6421EC5A0230B9D2706E9A9324138E7 41,0
 Key ":C-L"
-Display 80,30 2C2BCA9050E59298FEDEB5EFAF528EAE 41,13
+Display 80,30 E06AC9F8F2EA60832BA8836A50F73E38 41,13
 Key ":C-X"
-Display 80,30 94C4FAFAE138C1E42A69D6B45DDB2F6F 41,13
+Display 80,30 C156F7FC2572C323B0D970CA630466D3 41,13
 Key ":C-C"
-Display 80,30 5FFCAF70E166C6D80CDC2B4726ABFB53 41,13
+Display 80,30 D838FFA6D857EE40B7D77FBEBEC3CE8D 41,13
 Close 1440