linecount: enable for make-viewer

I don't remember exactly why it was a problem to line-count make-viewer,
possible because make out for the kernel could get very big.
But as linecount is faster and better, re-enable it.

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

diff --git a/lib-linecount.c b/lib-linecount.c
index a59b058bf9520262f370d6b7ddcc212cbd178885..2b716c58c510a194fedde971858ab1902dc69631 100644 (file)
--- a/lib-linecount.c
+++ b/lib-linecount.c
@@ -362,12 +362,8 @@ DEF_CMD(linecount_notify_goto)
 
 DEF_CMD(count_lines)
 {
-       char *view = pane_attr_get(ci->focus, "view-default");
        int async = strcmp(ci->key, "CountLinesAsync") == 0;
 
-       /* FIXME this type-check is a HACK */
-       if (view && strcmp(view, "make-viewer") == 0)
-               return 1;
        /* FIXME optimise this away most of the time */
        if (call("doc:notify:doc:CountLines", ci->focus, 1) == 0) {
                /* No counter in place, add one */

diff --git a/tests.d/02-grep b/tests.d/02-grep
index ed95776744433c42eac7e2b2e50a354b30bf02c9..526465575b61bc93a884673f2f624be2e8e07052 100644 (file)
--- a/tests.d/02-grep
+++ b/tests.d/02-grep
@@ -64,182 +64,182 @@ Display 80,30 0AACF65EE47F78322E278C43FB3773A6 28,7
 Key ":A-."
 Display 80,30 D23D21D0B80BFBB0DA018CF768D8A6D9 52,13
 Key ":Enter"
-Display 80,30 F6604B8CA9B5A2A73DA48F8AC7CFE127 11,10
-Display 80,30 517673C86DF8C4E1F9B296BDEE0F3BE7 11,10
+Display 80,30 D3AEBB90EB2C5DB570D9301483F30022 11,10
+Display 80,30 391E94BF2DF2C9604528D0F3DDECB343 11,10
 Key ":Enter"
-Display 80,30 446DD5C10A088B805D54291EE0F0862D 1,1
+Display 80,30 20A6C2316EA6C6F2C837ED7BF0790C8D 1,1
 Display 80,30 E3ACF4433B7F90BDF1A870808B398A70 1,1
 Key ":C-X"
 Display 80,30 6480624A6FD9BE7C74F17BA5F093F3AD 1,1
 Key "-`"
-Display 80,30 1AFED1BA98BDF5DA890DFD8B0A52861E 1,7
-Display 80,30 91B3491EDFFAF749FCA13963CCFEC480 1,7
+Display 80,30 C95517897FA2FDD36E0D32F2ADE24A99 1,7
+Display 80,30 0BC8B8BCE02BFFDADAFCC520BA81A133 1,7
 Key "-`"
-Display 80,30 89A633896D9E9778FE397F061E394A0C 1,6
+Display 80,30 A493DDF40FA2085D4FC2CB2A8D3190E1 1,6
 Key "-`"
-Display 80,30 ADEAB295CF4447EDDC4FD7ED1B913069 1,7
+Display 80,30 D91164E83162F70F4786237BCFBC71A3 1,7
 Key "-`"
-Display 80,30 E6E3315309F5B1449419DAC89AA9B34E 1,6
+Display 80,30 81119695E2E7A0B9EDC84A473C6F63ED 1,6
 Key "-`"
-Display 80,30 F56A70A8762C9924864031FF300BC82D 1,7
+Display 80,30 D47F384C4EE423774166414B7C928D6A 1,7
 Key "-`"
-Display 80,30 E25F41CAEC24248BCE10C24D5E65B459 1,9
+Display 80,30 BCB642A843697EAC24C93E65BD548B2D 1,9
 Key "-`"
-Display 80,30 158EEC65146C6D478A3D1A5745F5A76A 1,6
+Display 80,30 C4558E086434B6CEA6F28EC38DC0ECD0 1,6
 Key ":A-0"
-Display 80,30 C2AC2B8D15CC48670D5141EFF957264C 1,6
+Display 80,30 F3D5D6A5E0A5D5975ECB6E7F00917039 1,6
 Key ":C-X"
-Display 80,30 7B939320029ED80340F538DD50C9AD6D 1,6
+Display 80,30 2D8E0ECD65429DDDA3F1C8A49A73E1D8 1,6
 Key "-`"
-Display 80,30 6806FEBD8EE77BBE2C4062131CFF5AB0 1,1
+Display 80,30 1A4BDA70365FA2BE77204B4D3C5A71FD 1,1
 Key "-`"
-Display 80,30 CCC196474A843F159545A0B8653DB9F7 1,7
+Display 80,30 6488347D7F4C458D0C4DB4DD9EDB8DA5 1,7
 Key "-`"
-Display 80,30 242082CE9288232ED2EA1B1DBA9D68B8 1,6
+Display 80,30 69AD76906A155260B345D2BA411F3921 1,6
 Key "-`"
-Display 80,30 DF2C66DF58B01583AB358F929E2C70CC 1,7
+Display 80,30 047048FF34AD3B5A3C889C79BEC80EAB 1,7
 Key "-`"
-Display 80,30 B5AF25324A1D33FF684BF2EF66C483FC 1,6
+Display 80,30 2D5FBF9D6847197E8686AE154C0CA6B2 1,6
 Key "-`"
-Display 80,30 BFC5AA270B2C895D796578B6CCD0F693 1,7
+Display 80,30 14302278E63F297EDCB931F482E34BDE 1,7
 Key "-`"
-Display 80,30 E25F41CAEC24248BCE10C24D5E65B459 1,9
+Display 80,30 BCB642A843697EAC24C93E65BD548B2D 1,9
 Key ":A--"
-Display 80,30 534DAA56813C60453BCE62E0C162D258 1,9
+Display 80,30 7A911AEF593FC17E29D5B1B39B19D154 1,9
 Key ":C-X"
-Display 80,30 81DB4EB5949395E192C3C958CD666297 1,9
+Display 80,30 01EC2055C21E211A34F4A0EEB1C00AC9 1,9
 Key "-`"
-Display 80,30 E25F41CAEC24248BCE10C24D5E65B459 1,9
+Display 80,30 BCB642A843697EAC24C93E65BD548B2D 1,9
 Key "-`"
-Display 80,30 BFC5AA270B2C895D796578B6CCD0F693 1,7
+Display 80,30 14302278E63F297EDCB931F482E34BDE 1,7
 Key "-`"
-Display 80,30 B5AF25324A1D33FF684BF2EF66C483FC 1,6
+Display 80,30 2D5FBF9D6847197E8686AE154C0CA6B2 1,6
 Key ":C-X"
-Display 80,30 83F6AB840D22ABA09A072A58592E059D 1,6
+Display 80,30 77F1C291B9214AE59842D4BD18F6A05F 1,6
 Key ":C-F"
-Display 80,30 5ABF9E6C17A267D5091B5F3AF4916D2E 53,13
+Display 80,30 F3637D045FF6732253B486CC7883A246 53,13
 Key ":Backspace"
-Display 80,30 056EDB3091A562E5E22B78BDB4DDFE96 52,13
+Display 80,30 98FD00AFA4EFC281DF9715393A93ADC7 52,13
 Key ":Backspace"
-Display 80,30 13F361F0D8269F2648AFEF7BB140ECE7 51,13
+Display 80,30 F7750F7D0659BE45E282941A246AFAF3 51,13
 Key ":Backspace"
-Display 80,30 F9C9FE72E549531FEABF9485063DBC8C 50,13
+Display 80,30 4364A3294D6A3471B95CB3A113454F54 50,13
 Key ":Backspace"
-Display 80,30 406FBC9A5E9C833AEB19DED3EEDF145A 49,13
+Display 80,30 46A7E817BE400A7F3CD2486AB300B16D 49,13
 Key ":Enter"
-Display 80,30 A0EB07F7881E7347A38952A4F217F7B1 1,1
+Display 80,30 1FA08B9B5E70EDCDE48B0B6BBB8FBB79 1,1
 Key ":A-x"
-Display 80,30 06CBFF37B3E20B05110BDEBD59895F0E 26,13
+Display 80,30 8370E0437143A51ECAB53E987B3972E7 26,13
 Key "-g"
-Display 80,30 8B4415C57119B85525AD860399CB39E9 27,13
+Display 80,30 050CEDF383F85C2413359BA4E7A2F819 27,13
 Key "-r"
-Display 80,30 2CFE3824F20F5B6B92D155BD1DC9502F 28,13
+Display 80,30 B4E5C193721248E76230055549ADB668 28,13
 Key "-e"
-Display 80,30 E462F0D18CC7936E9DDB7509F8D6F0A5 29,13
+Display 80,30 F1CF206B833E6F6C26C0F87AD667CAC0 29,13
 Key "-p"
-Display 80,30 467CCB01F1D1FEEBCC1138EE43784E90 30,13
+Display 80,30 0685B5C7961702A2D2E058CE75D5ED0B 30,13
 Key ":Enter"
-Display 80,30 6E09260066D6D78B1BC0130705CE4B93 44,13
+Display 80,30 1C22072D61E586F2EA599941BC9E796A 44,13
 Key "-w"
-Display 80,30 E2C4A2F45DB9379CBEDE4DDD41118283 45,13
+Display 80,30 B0B4EDB23E516BB7901E4636D8DA6F7C 45,13
 Key "-i"
-Display 80,30 0B2F9CCD0543A1DB469D5FA252DAA395 46,13
+Display 80,30 95199C6743E0192C6E669B603740E19F 46,13
 Key "-n"
-Display 80,30 C5EB42F0C3AB38D99B1289DE7F9B8EEA 47,13
+Display 80,30 53D880F9CDD6641034EB717F0EB8CCE1 47,13
 Key "-d"
-Display 80,30 D89770A40EE7E26A0781907EFF682230 48,13
+Display 80,30 D483FDE9B051E04B4224857EDFC1907D 48,13
 Key "-o"
-Display 80,30 5D104EF7666AC8D1BD9EE901A92E9439 49,13
+Display 80,30 CF0841AC5E74686D1058832ED4FA139F 49,13
 Key "-w"
-Display 80,30 7DEFFB258B92B98AE2B609DADA77406D 50,13
+Display 80,30 F6D9600853632ADB6085BA2A54E916CB 50,13
 Key "- "
-Display 80,30 7DEFFB258B92B98AE2B609DADA77406D 51,13
+Display 80,30 F6D9600853632ADB6085BA2A54E916CB 51,13
 Key "-*"
-Display 80,30 590D1FEA9C1DC4A0A3134971A0017B19 52,13
+Display 80,30 0E971777339A03E376C63FE3B869CC85 52,13
 Key "-."
-Display 80,30 2F0A79D1A8E9C42170E6ACDBC4036FDB 53,13
+Display 80,30 A6DA3028E11B907B44B618AF70E8E270 53,13
 Key "-c"
-Display 80,30 8B37CDB7C79EE28983C6834371245BFD 54,13
+Display 80,30 164CE291663AC22726B5E660E738F778 54,13
 Key ":Enter"
-Display 80,30 DDDD07F61C5F0D383FDA92F6DE2969A4 11,10
+Display 80,30 C978E543942769649E32F496895E0D4F 11,10
 Key ":C-N"
-Display 80,30 DDDD07F61C5F0D383FDA92F6DE2969A4 11,10
+Display 80,30 C978E543942769649E32F496895E0D4F 11,10
 Key ":C-N"
-Display 80,30 DDDD07F61C5F0D383FDA92F6DE2969A4 11,10
+Display 80,30 C978E543942769649E32F496895E0D4F 11,10
 Key ":C-N"
-Display 80,30 DDDD07F61C5F0D383FDA92F6DE2969A4 11,10
+Display 80,30 C978E543942769649E32F496895E0D4F 11,10
 Key ":C-N"
-Display 80,30 DDDD07F61C5F0D383FDA92F6DE2969A4 11,10
+Display 80,30 C978E543942769649E32F496895E0D4F 11,10
 Key ":C-N"
-Display 80,30 DDDD07F61C5F0D383FDA92F6DE2969A4 11,10
+Display 80,30 C978E543942769649E32F496895E0D4F 11,10
 Key ":C-N"
-Display 80,30 DDDD07F61C5F0D383FDA92F6DE2969A4 11,10
+Display 80,30 C978E543942769649E32F496895E0D4F 11,10
 Key "-f"
-Display 80,30 7980101B6581EB038F74F27ACFAB1B63 11,10
+Display 80,30 23FE11BBE7E97845B0F678F12ACF486B 11,10
 Key ":C-V"
-Display 80,30 DDDD07F61C5F0D383FDA92F6DE2969A4 11,10
+Display 80,30 C978E543942769649E32F496895E0D4F 11,10
 Key ":C-V"
 Key ":C-V"
-Display 80,30 E49A82804786F7E02600D132407D09ED 11,10
+Display 80,30 E3E86ACB1350469620DA7A624537F680 11,10
 Key ":A-B"
-Display 80,30 A0EB07F7881E7347A38952A4F217F7B1 1,1
+Display 80,30 1FA08B9B5E70EDCDE48B0B6BBB8FBB79 1,1
 Key ":C-X"
-Display 80,30 C0FECF49E05910AD47E125D7409C74D1 1,1
+Display 80,30 0AE046CA7C250270DBE14564AFC5D6B1 1,1
 Key "-`"
-Display 80,30 B91B85CF2D2EC4998AAF36B900C7CCD3 1,6
-Display 80,30 DF24801296422814BF56BB302F97317B 1,6
+Display 80,30 280F34459E38D67B0C1BC57349183FA7 1,6
+Display 80,30 DF026DBC4E8B692B626AB5D9364E8DD1 1,6
 Key "-`"
-Display 80,30 1495228F83D1EE9A9358C27EEC2F9D92 1,6
+Display 80,30 8557455273011DFCCAB6707018F20080 1,6
 Key "-`"
-Display 80,30 D7E464A06FE94105BFD7EF8BC5028D30 1,6
+Display 80,30 9554D9EB1BFDBAB109AD1EB8A52410F0 1,6
 Key ":C-X"
-Display 80,30 668BF067274249780E7E161ACE5BBDA3 1,6
+Display 80,30 4E72B73729256152BD65FE9E1B4A4A8E 1,6
 Key "-o"
-Display 80,30 19D22E40696B7798CB41AC846C7DFE75 1,22
+Display 80,30 760825F4C71D0AD80D4D5D4E8820E9B6 1,22
 Key ":A->"
-Display 80,30 C42CA0B8420526C3B2F08DBAB42F1066 1,26
+Display 80,30 E4CDCF8E92A7F9AD3E7CB147AC8CCC13 1,26
 Key ":C-P"
-Display 80,30 C42CA0B8420526C3B2F08DBAB42F1066 1,25
+Display 80,30 DD0FEDA3AF8AED4A558FE3FDADC678EA 1,25
 Key ":C-P"
-Display 80,30 C42CA0B8420526C3B2F08DBAB42F1066 1,24
+Display 80,30 E9E0DADADE377130A62D220DA8AA8008 1,24
 Key ":C-P"
-Display 80,30 C42CA0B8420526C3B2F08DBAB42F1066 1,22
+Display 80,30 C389ED19D3ACC8BBDE69C5E6FE6B8C65 1,22
 Key ":C-P"
-Display 80,30 C42CA0B8420526C3B2F08DBAB42F1066 1,20
+Display 80,30 8308A863257D15FF6CFD47092F8A35EA 1,20
 Key ":C-P"
-Display 80,30 C42CA0B8420526C3B2F08DBAB42F1066 1,18
+Display 80,30 EDC182DFDB40396F65D8043016D7FC19 1,18
 Key ":Enter"
-Display 80,30 D16C09339A3431526BE7DB980528A0B5 1,6
+Display 80,30 1E04940AC09DC8BC618D5E2CC38728B7 1,6
 Key ":C-X"
-Display 80,30 D70453802D58CB82D5516B7D5C702410 1,6
+Display 80,30 A93A90E6474101A7820B771D5B791CB5 1,6
 Key "-`"
-Display 80,30 702308D96834B332401FC603F51C4BEE 1,6
+Display 80,30 AE838B5AC19AB30A861A536232DF7550 1,6
 Key "-`"
-Display 80,30 48CCA8EE16A87E8B216252A97F342218 1,6
+Display 80,30 4E249F9437337F180213FDA03042636D 1,6
 Key "-`"
-Display 80,30 DD72D8CA8D394C04B2E93A50922785A0 1,6
+Display 80,30 19BB941588C3D1B758A056460DE1976C 1,6
 Key ":C-X"
-Display 80,30 977F875D087280C030529E52F485A8B6 1,6
+Display 80,30 A2481BECD4D452D469F6807FBF07651A 1,6
 Key "-`"
-Display 80,30 77DE215D2A223574768436FA0878E211 1,6
+Display 80,30 5D341DFB17A2E948B94761517ED616C9 1,6
 Key "-`"
-Display 80,30 8690106A3ED94DA174E00058C545A5AB 1,8
+Display 80,30 71C4407673FCB6E72FF896A80D6FE28F 1,8
 Key "-`"
-Display 80,30 7329A093DFEAE856D516554F7BF15E0E 1,6
+Display 80,30 62FAFC892B77DBBE87F1F6474428288C 1,6
 Key ":A-0"
-Display 80,30 2CD8042C79ECD24B862A5A1C60752498 1,6
+Display 80,30 24D06B5BDB1156C448BB2C834EBFEB0D 1,6
 Key ":C-X"
-Display 80,30 CE274EEFE02ED52770921F9FEE8B01E7 1,6
+Display 80,30 21E6552D05C66759463998F9131CA4AE 1,6
 Key "-`"
-Display 80,30 6806FEBD8EE77BBE2C4062131CFF5AB0 1,1
+Display 80,30 1A4BDA70365FA2BE77204B4D3C5A71FD 1,1
 Key "-`"
-Display 80,30 CCC196474A843F159545A0B8653DB9F7 1,7
+Display 80,30 6488347D7F4C458D0C4DB4DD9EDB8DA5 1,7
 Key "-`"
-Display 80,30 242082CE9288232ED2EA1B1DBA9D68B8 1,6
+Display 80,30 69AD76906A155260B345D2BA411F3921 1,6
 Key "-`"
-Display 80,30 DF2C66DF58B01583AB358F929E2C70CC 1,7
+Display 80,30 047048FF34AD3B5A3C889C79BEC80EAB 1,7
 Key ":C-X"
-Display 80,30 FA17B346317A69478E56D0FFAEE3BD13 1,7
+Display 80,30 30F547D164082EB43DE8E55407DF0C7F 1,7
 Key ":C-C"
-Display 80,30 C6ED20B5EF84117E136B0EEC0F58C031 1,7
+Display 80,30 E813481BF8DDB7790724A5B30D2CE6CA 1,7
 Close 819