format: handle line-count properly for format2

There is along standing bug that the linecount appears to be elevated in
a formatted view anywhere but at the start of the line.
Also word counts don't work properly.

Now that we can attach line counting to a view, this can be fixed.

Also: allow view-based linecount to be disabled by parent.  It is
notably slower and for notmuch search view it is too slow.

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

diff --git a/DOC/TODO.md b/DOC/TODO.md
index 91a0732e9a73d6a501cb94640fb499e0b1ddf800..b64a35b9fd1f65b2560b902d3ee51f0f7e27dbcf 100644 (file)
--- a/DOC/TODO.md
+++ b/DOC/TODO.md
@@ -9,6 +9,7 @@ the file.
 
 ### Trivial
 
+- [ ] If an email part doesn't end with newline, last character is swallowed.
 
 ### Small
 

diff --git a/python/module-notmuch.py b/python/module-notmuch.py
index 60086c9205bc25e17e92a10def69400af48a1606..41cd86ded53ff5072208dbeaaa64964b63db3db6 100644 (file)
--- a/python/module-notmuch.py
+++ b/python/module-notmuch.py
@@ -3651,6 +3651,7 @@ def notmuch_doc(key, home, focus, comm2, **a):
 
 def render_query_attach(key, focus, comm2, **a):
     p = notmuch_query_view(focus)
+    p["format:no-linecount"] = "1"
     p = p.call("attach-render-format", ret='pane')
     p['render-wrap'] = 'yes'
     if comm2:

diff --git a/render-format.c b/render-format.c
index ac61951f96dcb5881b068fea60e2505c8d27efed..59abab3506274828c122b46700b0f8548c513ced 100644 (file)
--- a/render-format.c
+++ b/render-format.c
@@ -38,6 +38,7 @@ struct rf_data {
        char *attr_cache;
        void *cache_pos;
        int cache_field;
+       bool no_linecount;
 };
 
 static inline short FIELD_NUM(int i) { return i >> 16; }
@@ -923,6 +924,46 @@ DEF_CMD(render_line_prev2)
        return 1;
 }
 
+DEF_CMD(format_request)
+{
+       /* Someone wants to count lines - attach the line count here,
+        * rather than let it fall through to document.
+        */
+       struct rf_data *rd = ci->home->data;
+
+       if (rd->no_linecount)
+               return Efallthrough;
+       pane_add_notify(ci->focus, ci->home, ksuffix(ci, "doc:request:"));
+       if (strcmp(ci->key, "doc:request:doc:replaced") == 0)
+               /* Though for doc:replaced, we want the doc to respond too */
+               return Efallthrough;
+       return 1;
+}
+
+DEF_CMD(format_countlines)
+{
+       return pane_notify(ksuffix(ci, "doc:notify:"),
+                          ci->home,
+                          ci->num, ci->mark, ci->str,
+                          ci->num2, ci->mark2, ci->str2, ci->comm2);
+}
+
+DEF_CMD(status_changed)
+{
+       /* line-count sent a status-change message */
+       call("doc:status-changed", ci->focus->parent);
+       return 1;
+}
+
+DEF_CMD(doc_replaced)
+{
+       /* doc sent a doc;replaced message */
+       pane_notify("doc:replaced", ci->home,
+                   ci->num, ci->mark, ci->str,
+                   ci->num2, ci->mark2, ci->str2, ci->comm2);
+       return 1;
+}
+
 static struct pane *do_render_format_attach(struct pane *parent safe);
 DEF_CMD(format_clone)
 {
@@ -959,6 +1000,11 @@ static void render_format_register_map(void)
        key_add(rf2_map, "doc:content", &format_content2);
        key_add(rf2_map, "Free", &format_free);
        key_add(rf2_map, "doc:shares-ref", &format_noshare_ref);
+       key_add(rf2_map, "doc:request:doc:CountLines", &format_request);
+       key_add(rf2_map, "doc:request:doc:replaced", &format_request);
+       key_add(rf2_map, "doc:notify:doc:CountLines", &format_countlines);
+       key_add(rf2_map, "doc:status-changed", &status_changed);
+       key_add(rf2_map, "doc:replaced", &doc_replaced);
 }
 
 DEF_LOOKUP_CMD(render_format_handle, rf_map);
@@ -979,7 +1025,13 @@ static struct pane *do_render_format_attach(struct pane *parent safe)
                        render_format_register_map();
 
                alloc(rf, pane);
+               if (pane_attr_get(parent, "format:no-linecount"))
+                       rf->no_linecount = True;
                p = pane_register(parent, 0, &render_format2_handle.c, rf);
+               if (p) {
+                       pane_add_notify(p, p, "doc:status-changed");
+                       home_call(parent, "doc:request:doc:replaced", p);
+               }
        }
        if (!p)
                return NULL;

diff --git a/tests.d/00-basic b/tests.d/00-basic
index 34b74de75c3073ddae8b169d433ff2b3d6c74ae0..c8c624b1b5c02f045222b599f7d60d0a4ba256eb 100644 (file)
--- a/tests.d/00-basic
+++ b/tests.d/00-basic
@@ -1,18 +1,18 @@
-Display 80,30 D52D08A06C00009014A3608D0AB0AC64 1,1
+Display 80,30 0E13FF000A6039C56B47A6F5CAF58565 1,1
 Key ":C-N"
-Display 80,30 6B1A9B827827AC1E2DAE33FD66286F70 1,2
+Display 80,30 03B92272DFB8DF74810D0B6FAB21E722 1,2
 Key ":C-N"
-Display 80,30 3CB0782907B184ACC1A12BC34CD4A940 1,3
+Display 80,30 D147F51CE14EFF4A573A8FFC149C06D0 1,3
 Key ":C-N"
-Display 80,30 89D35EB9E8C139FA641E1FCF6E763895 1,4
+Display 80,30 2C25DF65F556E89FDEE4AF0A62590A1C 1,4
 Key ":C-N"
-Display 80,30 5B63106257CE68C0B4BB83F909B7C0B4 1,5
+Display 80,30 4E1BBBF99FCFDAA42EB7B1A0494829AC 1,5
 Key ":C-N"
-Display 80,30 75EA80F3E54826ED3BAE891C21E16A79 1,6
+Display 80,30 1FF3A700863D899861A6962CDF7A3F5C 1,6
 Key ":C-N"
-Display 80,30 16C15C096FC13D531BBE071C7B751EF3 1,7
+Display 80,30 8BCEF4D94B8E0CD00A572C405BFCD16A 1,7
 Key ":C-N"
-Display 80,30 B8B40E4F4A1EAEC1C6E233D195894D9F 1,8
+Display 80,30 9C096A8B2633F1429AB22345C20B3B33 1,8
 Key ":Enter"
 Display 80,30 8F30DCB483C65D442FBEFA53E624FBB8 1,0
 Key ":A->"
@@ -578,27 +578,27 @@ Display 80,30 4B1C47234051213271FED14393477B35 1,3
 Key ":C-X"
 Display 80,30 F96972F072D843A031AD49641130AF4E 1,3
 Key "-k"
-Display 80,30 B8B40E4F4A1EAEC1C6E233D195894D9F 1,8
+Display 80,30 9C096A8B2633F1429AB22345C20B3B33 1,8
 Key ":C-X"
-Display 80,30 D9F43AF47815B46A3E90E0795A30B979 1,8
+Display 80,30 F99CB281FCAB081AD57FCDB39F9BF460 1,8
 Key ":C-F"
-Display 80,30 A2D89C6E31CE2879FB1F56913ED04431 49,13
+Display 80,30 12FF58D4DFC3A16210E959F8C0596BB4 49,13
 Key "-m"
-Display 80,30 A7CB18AEFD9EE08B3FD1E1D574432458 50,13
+Display 80,30 6C743A9ECFFA129E344D137CAA6A72B5 50,13
 Key ":Tab"
-Display 80,30 E3CD841EBC7CC3B8E29D7F93ACDC5080 31,13
+Display 80,30 E1F8E7703A0F41DE0FE7275B3F8DB123 31,13
 Key ":Up"
-Display 80,30 E3CD841EBC7CC3B8E29D7F93ACDC5080 31,12
+Display 80,30 E1F8E7703A0F41DE0FE7275B3F8DB123 31,12
 Key ":Up"
-Display 80,30 E3CD841EBC7CC3B8E29D7F93ACDC5080 31,11
+Display 80,30 E1F8E7703A0F41DE0FE7275B3F8DB123 31,11
 Key ":Up"
-Display 80,30 E3CD841EBC7CC3B8E29D7F93ACDC5080 31,10
+Display 80,30 E1F8E7703A0F41DE0FE7275B3F8DB123 31,10
 Key ":Up"
-Display 80,30 E3CD841EBC7CC3B8E29D7F93ACDC5080 31,9
+Display 80,30 E1F8E7703A0F41DE0FE7275B3F8DB123 31,9
 Key ":Up"
-Display 80,30 E3CD841EBC7CC3B8E29D7F93ACDC5080 31,8
+Display 80,30 E1F8E7703A0F41DE0FE7275B3F8DB123 31,8
 Key ":Enter"
-Display 80,30 1BD37E87287E073A509347C57696FAE7 55,13
+Display 80,30 C05E13A6A41F29DB02B0BD3FE089B446 55,13
 Key ":Enter"
 Display 80,30 4790F2887DC559E9927F4059D9F4365D 1,0
 Key ":C-X"

diff --git a/tests.d/00-mouse b/tests.d/00-mouse
index eb7a808a397fb9e790b89d880f88a53508974b8e..e2093eadf152d94927d8d076879446d8fac6ccef 100644 (file)
--- a/tests.d/00-mouse
+++ b/tests.d/00-mouse
@@ -1,43 +1,43 @@
-Display 80,30 D52D08A06C00009014A3608D0AB0AC64 1,1
+Display 80,30 0E13FF000A6039C56B47A6F5CAF58565 1,1
 Key ":C-X"
-Display 80,30 72554BDCE7C88CB96C5C31E58EEE15AB 1,1
+Display 80,30 4B286F8D524DAB672B799E321FD42B17 1,1
 Key "-3"
-Display 80,30 E18FE3E78F1907574887EB55257F5B06 1,1
+Display 80,30 BA73BF451FFAF174118B3EBA218FF5FE 1,1
 Key ":C-X"
-Display 80,30 CDEF36693D7EB7F48B0DB2AB92D5132B 1,1
+Display 80,30 8A952026042107C94674A179292BE6D7 1,1
 Key ":C-F"
-Display 80,30 964D3AC6C86CD51CD99DF6ED139AF26A 49,13
+Display 80,30 61D47B6829C5DF91647FE2127F4B5C0C 49,13
 Key "-R"
-Display 80,30 B3A9809BE7A1DDE545F83E971C170608 50,13
+Display 80,30 F513B299D525751CAF9A5E7CFA6FC5F5 50,13
 Key "-E"
-Display 80,30 65D38912E152D9A94769EDDEB3071090 51,13
+Display 80,30 45E58D153AC2D1CEC61AA0B830349C59 51,13
 Key ":Tab"
-Display 80,30 6991E8A38B8624A9F11C41F69D334015 50,13
+Display 80,30 A515F037945E89049CB1F2A12890CED3 50,13
 Key ":Enter"
-Display 80,30 562B6885C13C5F734242568965D3C2CB 1,0
+Display 80,30 C408983124FC518AC598EA1A35BDD646 1,0
 Mouse ":Press-1" 20,17
-Display 80,30 0F7EAF652C24578C47F0C3432B868C1E 20,17
+Display 80,30 A1CDAFA9E710D9CA17BAA74818703B71 20,17
 Mouse ":Release-1" 20,17
 Mouse ":Press-1" 60,16
-Display 80,30 5F2D2593F520941A5414515217A760A9 60,16
+Display 80,30 32B54193423379ABDC46D26053C5AAE1 60,16
 Mouse ":Release-1" 60,16
 Key ":C-E"
-Display 80,30 178F128D102F096777B8293EF8909A0C 76,16
+Display 80,30 9ABAA19054DD85D09426325A79128E91 76,16
 Mouse ":Press-1" 66,13
-Display 80,30 6FA984463764150D5EECCC5E37A2EB05 66,13
+Display 80,30 D4129726DD29643020920894F23E5389 66,13
 Mouse ":Release-1" 66,13
 Mouse ":Press-1" 65,22
-Display 80,30 E866A95289367EA6DDE64164CAF69E32 65,22
+Display 80,30 6DA950B1CAAA1198C116E52C99FC2008 65,22
 Mouse ":Release-1" 65,22
 Mouse ":Press-1" 60,11
-Display 80,30 40A3D58AAFB06F59089C5BE234A5F5E0 60,11
+Display 80,30 5853A05F25F13E7EC8F159D8E17B1BA5 60,11
 Mouse ":Release-1" 60,20
-Display 80,30 8E8082504996C7B67C722FA28FD8C9D3 60,20
+Display 80,30 556EC28E89E8E64024D3F864B2BD0031 60,20
 Mouse ":Press-1" 17,7
-Display 80,30 1C10965CDBF1E3EC69BAFF211EBB3F50 17,7
+Display 80,30 B4D32E6F0D6B7ADEBD82B4AA8A199A61 17,7
 Mouse ":Release-1" 17,20
-Display 80,30 077B19693D60222586F389C4E4540CDD 17,20
+Display 80,30 50C981E00FFF0375A7B1A6724D9F8717 17,20
 Mouse ":Press-1" 8,4
-Display 80,30 FE6ECE58AD651C8EFEB99547303F5181 8,4
+Display 80,30 8A8EA2DF577EB3DC956A0E0CC673A192 8,4
 Mouse ":Release-1" 8,4
 Close 223

diff --git a/tests.d/01-c-mode b/tests.d/01-c-mode
index dd4fd3e52cf728b14a6b600f03b1530e3c10587c..6d8a18146a1d98f81b38c4a3850649a2a06ee8d0 100644 (file)
--- a/tests.d/01-c-mode
+++ b/tests.d/01-c-mode
@@ -1,22 +1,22 @@
-Display 80,30 D52D08A06C00009014A3608D0AB0AC64 1,1
+Display 80,30 0E13FF000A6039C56B47A6F5CAF58565 1,1
 Key ":C-X"
-Display 80,30 72554BDCE7C88CB96C5C31E58EEE15AB 1,1
+Display 80,30 4B286F8D524DAB672B799E321FD42B17 1,1
 Key ":C-F"
-Display 80,30 4E5F2C791D9F8BA28CC5C6EFFC46651E 49,13
+Display 80,30 70CEEB1D017973D1B50EB2B564513F53 49,13
 Key "-c"
-Display 80,30 FF52AEB1E1C93CCF0C03E9C90FFC4767 50,13
+Display 80,30 BEC32BA701B3689E86C18B998EB68563 50,13
 Key "-o"
-Display 80,30 39B1D6AF3944CE6F517CF94A92C530E0 51,13
+Display 80,30 D0EB1413F37C227C4550CED6AFE7DE93 51,13
 Key "-r"
-Display 80,30 EB10B1BC3B9150113F7071ACCDCDD3DE 52,13
+Display 80,30 04428C226AF789D8C56BF1033E5E0F5F 52,13
 Key "-e"
-Display 80,30 288BCF8E34DFF6E61B1EF07491C2915D 53,13
+Display 80,30 C577A30F2B38BDCD121980881B8AEB81 53,13
 Key "--"
-Display 80,30 DE5B96A5660FE28E4CB0B94647C76E2D 54,13
+Display 80,30 C85DA3D8AA001568EB7DA6C8787C6B61 54,13
 Key "-p"
-Display 80,30 FA99040196C0BD0586F38C6DA6CF634E 55,13
+Display 80,30 CC7A5B6182D970690DFA604648DB31C6 55,13
 Key ":Tab"
-Display 80,30 5DC9572ACD9AC76F8038CFAEE6015516 52,13
+Display 80,30 3A55A3B91A2119E3C2909B922991E1C9 52,13
 Key ":Enter"
 Display 80,30 AD7600721C60F233CC0638FF475356CE 1,0
 Key ":C-V"

diff --git a/tests.d/01-hex b/tests.d/01-hex
index 19803e41563f7955d68548b24cb8aad1b121731a..dc196d51b1dc36db1020d7aa901749172d3ece1d 100644 (file)
--- a/tests.d/01-hex
+++ b/tests.d/01-hex
@@ -1,16 +1,16 @@
-Display 80,30 D52D08A06C00009014A3608D0AB0AC64 1,1
+Display 80,30 0E13FF000A6039C56B47A6F5CAF58565 1,1
 Key ":C-N"
-Display 80,30 6B1A9B827827AC1E2DAE33FD66286F70 1,2
+Display 80,30 03B92272DFB8DF74810D0B6FAB21E722 1,2
 Key ":C-N"
-Display 80,30 3CB0782907B184ACC1A12BC34CD4A940 1,3
+Display 80,30 D147F51CE14EFF4A573A8FFC149C06D0 1,3
 Key ":C-N"
-Display 80,30 89D35EB9E8C139FA641E1FCF6E763895 1,4
+Display 80,30 2C25DF65F556E89FDEE4AF0A62590A1C 1,4
 Key ":C-N"
-Display 80,30 5B63106257CE68C0B4BB83F909B7C0B4 1,5
+Display 80,30 4E1BBBF99FCFDAA42EB7B1A0494829AC 1,5
 Key ":C-N"
-Display 80,30 75EA80F3E54826ED3BAE891C21E16A79 1,6
+Display 80,30 1FF3A700863D899861A6962CDF7A3F5C 1,6
 Key ":C-N"
-Display 80,30 16C15C096FC13D531BBE071C7B751EF3 1,7
+Display 80,30 8BCEF4D94B8E0CD00A572C405BFCD16A 1,7
 Key "-H"
 Display 80,30 92281E42E03D8429875720AA9C6E19A4 11,1
 Key ":C-N"

diff --git a/tests.d/01-python b/tests.d/01-python
index f90a6639f017701ebf87e0c291c582559e54c44e..6324bab7743f7f8100eacf39bfe2f385c79c3065 100644 (file)
--- a/tests.d/01-python
+++ b/tests.d/01-python
@@ -1,27 +1,27 @@
-Display 80,30 D52D08A06C00009014A3608D0AB0AC64 1,1
+Display 80,30 0E13FF000A6039C56B47A6F5CAF58565 1,1
 Key ":C-S"
-Display 80,30 E680464E1D83BB6C29C779EADB6FC5B3 50,0
+Display 80,30 E47CED4B1031403EB72821176649E688 50,0
 Key "-p"
-Display 80,30 72D2477414FE4FBCF213693A870B8ADE 10,0
-Display 80,30 4273FD2FBB26096A1901FC05516F2D8D 10,0
+Display 80,30 F2FA3D6B9A7272B44A47DC1E84A20094 10,0
+Display 80,30 983E9BEB47C4C286571B3DA28BDFFA2C 10,0
 Key "-y"
-Display 80,30 D12CEB352F8EE28829EF48B560D333F7 51,0
+Display 80,30 DD1783601AF9CCDDA572CBA482FBF56D 51,0
 Key "-t"
-Display 80,30 1C8CF93A41EEEDB8CA38D285B5154471 53,0
+Display 80,30 4C9C67C834CCFC0AA2B60E49DE2BDC2D 53,0
 Key "-h"
-Display 80,30 50934E915B08A1D0CFD538B11CF3ECCA 54,0
+Display 80,30 350F1B72340BCB1E30DB8629188FCFD4 54,0
 Key ":C-S"
-Display 80,30 44D880B18D83CCCF4CFF5B1CAB5C35F2 54,0
+Display 80,30 8DFAAE5F510C1D8DAA0877C14B3A1296 54,0
 Key ":Enter"
-Display 80,30 94A5FB3657058EE4B6962F0D557AD775 61,16
+Display 80,30 32112852551E58C291A5CB45D8CA8ED6 61,16
 Key ":Enter"
-Display 80,30 9ACDE1498A98E129AF2B17F1332FA6DC 1,1
+Display 80,30 C339859EB20766661E183A3D16CFBD0C 1,1
 Key ":C-N"
-Display 80,30 60229DB85D272011931CE0CF3E9ADE57 1,2
+Display 80,30 C64FD34515AD182F48E8719B897369DC 1,2
 Key ":C-N"
-Display 80,30 7DAAEC380AA7FD76E0909FDBE736EDB3 1,3
+Display 80,30 EC188746D23A428BEE7669202D8DD08C 1,3
 Key ":C-N"
-Display 80,30 D1FC6A80F09D2F2A7E1FBBF25BAE6E08 1,4
+Display 80,30 9F7ABAF8192D04685836D5FF3E73DEE9 1,4
 Key "-f"
 Display 80,30 E9092888207FD1480A6AAF2278A11CB0 1,0
 Key ":C-N"
@@ -493,9 +493,9 @@ Display 80,30 AB95403275CC666D8C3723A2D0485DEA 9,9
 Key ":C-X"
 Display 80,30 907C02FAECEA47C211FC58CDFA5A9D84 9,9
 Key "-k"
-Display 80,30 94A5FB3657058EE4B6962F0D557AD775 61,16
+Display 80,30 32112852551E58C291A5CB45D8CA8ED6 61,16
 Key ":C-X"
-Display 80,30 4C1A2AA1DDA467996C3CD922925C3838 61,16
+Display 80,30 FB5AFD4627214C1B1CBEE5CE437CD80A 61,16
 Key ":C-C"
-Display 80,30 94A5FB3657058EE4B6962F0D557AD775 61,16
+Display 80,30 32112852551E58C291A5CB45D8CA8ED6 61,16
 Close 843

diff --git a/tests.d/01-redraw b/tests.d/01-redraw
index 89b004423f9f26d0d1c887ca135e47e8621a4f60..3161802b2e66c24eed62b1ef8bdd68ced4f759aa 100644 (file)
--- a/tests.d/01-redraw
+++ b/tests.d/01-redraw
@@ -1,18 +1,18 @@
-Display 80,30 D52D08A06C00009014A3608D0AB0AC64 1,1
+Display 80,30 0E13FF000A6039C56B47A6F5CAF58565 1,1
 Key ":C-N"
-Display 80,30 6B1A9B827827AC1E2DAE33FD66286F70 1,2
+Display 80,30 03B92272DFB8DF74810D0B6FAB21E722 1,2
 Key ":C-N"
-Display 80,30 3CB0782907B184ACC1A12BC34CD4A940 1,3
+Display 80,30 D147F51CE14EFF4A573A8FFC149C06D0 1,3
 Key ":C-N"
-Display 80,30 89D35EB9E8C139FA641E1FCF6E763895 1,4
+Display 80,30 2C25DF65F556E89FDEE4AF0A62590A1C 1,4
 Key ":C-N"
-Display 80,30 5B63106257CE68C0B4BB83F909B7C0B4 1,5
+Display 80,30 4E1BBBF99FCFDAA42EB7B1A0494829AC 1,5
 Key ":C-N"
-Display 80,30 75EA80F3E54826ED3BAE891C21E16A79 1,6
+Display 80,30 1FF3A700863D899861A6962CDF7A3F5C 1,6
 Key ":C-N"
-Display 80,30 16C15C096FC13D531BBE071C7B751EF3 1,7
+Display 80,30 8BCEF4D94B8E0CD00A572C405BFCD16A 1,7
 Key ":C-N"
-Display 80,30 B8B40E4F4A1EAEC1C6E233D195894D9F 1,8
+Display 80,30 9C096A8B2633F1429AB22345C20B3B33 1,8
 Key "-f"
 Display 80,30 8F30DCB483C65D442FBEFA53E624FBB8 1,0
 Key ":A->"
@@ -36,9 +36,9 @@ Display 80,30 0FECC1058FFD056D9BACBCC5B317281A 1,1
 Key ":C-X"
 Display 80,30 2F49E1FB67BC2A2DDC2CA32459BB574B 1,1
 Key "-k"
-Display 80,30 B8B40E4F4A1EAEC1C6E233D195894D9F 1,8
+Display 80,30 9C096A8B2633F1429AB22345C20B3B33 1,8
 Key ":C-X"
-Display 80,30 D9F43AF47815B46A3E90E0795A30B979 1,8
+Display 80,30 F99CB281FCAB081AD57FCDB39F9BF460 1,8
 Key ":C-C"
-Display 80,30 B8B40E4F4A1EAEC1C6E233D195894D9F 1,8
+Display 80,30 9C096A8B2633F1429AB22345C20B3B33 1,8
 Close 164

diff --git a/tests.d/01-textfill b/tests.d/01-textfill
index 2107154d17b3dd0c21b28122235ea271b9884294..c494cbcdad2e3e9903f3aafe88cac7df11b7fc0c 100644 (file)
--- a/tests.d/01-textfill
+++ b/tests.d/01-textfill
@@ -1,18 +1,18 @@
-Display 80,30 D52D08A06C00009014A3608D0AB0AC64 1,1
+Display 80,30 0E13FF000A6039C56B47A6F5CAF58565 1,1
 Key ":C-N"
-Display 80,30 6B1A9B827827AC1E2DAE33FD66286F70 1,2
+Display 80,30 03B92272DFB8DF74810D0B6FAB21E722 1,2
 Key ":C-N"
-Display 80,30 3CB0782907B184ACC1A12BC34CD4A940 1,3
+Display 80,30 D147F51CE14EFF4A573A8FFC149C06D0 1,3
 Key ":C-N"
-Display 80,30 89D35EB9E8C139FA641E1FCF6E763895 1,4
+Display 80,30 2C25DF65F556E89FDEE4AF0A62590A1C 1,4
 Key ":C-N"
-Display 80,30 5B63106257CE68C0B4BB83F909B7C0B4 1,5
+Display 80,30 4E1BBBF99FCFDAA42EB7B1A0494829AC 1,5
 Key ":C-N"
-Display 80,30 75EA80F3E54826ED3BAE891C21E16A79 1,6
+Display 80,30 1FF3A700863D899861A6962CDF7A3F5C 1,6
 Key ":C-N"
-Display 80,30 16C15C096FC13D531BBE071C7B751EF3 1,7
+Display 80,30 8BCEF4D94B8E0CD00A572C405BFCD16A 1,7
 Key ":C-N"
-Display 80,30 B8B40E4F4A1EAEC1C6E233D195894D9F 1,8
+Display 80,30 9C096A8B2633F1429AB22345C20B3B33 1,8
 Key "-f"
 Display 80,30 8F30DCB483C65D442FBEFA53E624FBB8 1,0
 Key ":C-N"
@@ -568,9 +568,9 @@ Display 80,30 59BA738F647352E2E8224F038B032610 12,13
 Key ":C-X"
 Display 80,30 05546B93D9066F6349E248340D0926C3 12,13
 Key ":C-C"
-Display 80,30 3C9E22EF0D9BA903520243834F73EA14 21,9
+Display 80,30 A2D00677EA9CF8DCC1BCDC3CADA5F113 21,9
 Key "-n"
-Display 80,30 3C9E22EF0D9BA903520243834F73EA14 21,10
+Display 80,30 A2D00677EA9CF8DCC1BCDC3CADA5F113 21,10
 Key "-n"
 Display 80,30 59BA738F647352E2E8224F038B032610 12,13
 Close 1001

diff --git a/tests.d/02-diff b/tests.d/02-diff
index 9f51ed003a6ff3173af0416ebff4d4aefccf2859..31a6b3daeb161d78210a6e0b35a8137d730d0c32 100644 (file)
--- a/tests.d/02-diff
+++ b/tests.d/02-diff
@@ -1,40 +1,40 @@
-Display 80,30 D52D08A06C00009014A3608D0AB0AC64 1,1
+Display 80,30 0E13FF000A6039C56B47A6F5CAF58565 1,1
 Key ":A-!"
-Display 80,30 AA7853ACBB728EBA7032D524DA131DE7 36,13
+Display 80,30 117EFD5AE7EACEBF4CDB0C9F6A9A70FA 36,13
 Key "-g"
-Display 80,30 7EB15083C716615E92EEA118E3DAA5F2 37,13
+Display 80,30 E3D94D06C778FE66172C64609ADB5C64 37,13
 Key "-i"
-Display 80,30 1F9A892AF345A7A05276862DF6BF865E 38,13
+Display 80,30 7A2ABF344FCCDB18A3C24E44ABF7E388 38,13
 Key "-t"
-Display 80,30 A3AC3246B4CDFE89192F8A84D23CEAC3 39,13
+Display 80,30 B33E1BF70CC88E49ECA7E89CCBCB449A 39,13
 Key "- "
-Display 80,30 A3AC3246B4CDFE89192F8A84D23CEAC3 40,13
+Display 80,30 B33E1BF70CC88E49ECA7E89CCBCB449A 40,13
 Key "-s"
-Display 80,30 119A650F5411FF23C5E458CA0400F777 41,13
+Display 80,30 2A3EF585719FB7ECB5858785002E6C03 41,13
 Key "-h"
-Display 80,30 71843A118143F992EA1216B250B58F79 42,13
+Display 80,30 234FA8C09F491C3566FB4CD376620503 42,13
 Key "-o"
-Display 80,30 3BF1534ECFA89C6C74AE74C9D28310CF 43,13
+Display 80,30 4C4C6CB3CD1F6CBF55801B0888B48E9F 43,13
 Key "-w"
-Display 80,30 774E61FD57CD05012656460EA0D74BCE 44,13
+Display 80,30 22999CCEED4A60BBA451BDFEB0E17F40 44,13
 Key ":Enter"
-Display 80,30 D52D08A06C00009014A3608D0AB0AC64 1,1
-Display 80,30 3C07C8BD02196931A1C21EDF8CACD6D2 1,1
-Display 80,30 524BCCB0144D6588B343900436D91515 1,1
+Display 80,30 0E13FF000A6039C56B47A6F5CAF58565 1,1
+Display 80,30 C46B5CEC682971E44B1E046B064B630F 1,1
+Display 80,30 5B9AD1953416D107599500A88EBE63AF 1,1
 Key ":C-X"
-Display 80,30 6FC535EACF0D5E3F53C81794965F92A8 1,1
+Display 80,30 EB11E8DDD22F63F7625C2DEA19DDB26F 1,1
 Key "-o"
-Display 80,30 524BCCB0144D6588B343900436D91515 1,15
+Display 80,30 5B9AD1953416D107599500A88EBE63AF 1,15
 Key ":C-V"
-Display 80,30 3377EDAF5352E67A8AC5567BEFC94C8E 1,15
+Display 80,30 1C2A43C22286BC15539D12EFB756B19B 1,15
 Key ":C-V"
-Display 80,30 047FB205BB5E5340CD991862F8ED215D 1,15
+Display 80,30 A94E7053F9B32174A75C22840153E511 1,15
 Key ":C-V"
-Display 80,30 145E799EEED4DB362822CC3886A7537A 1,15
+Display 80,30 D3AD37D77E2DCB90B161B2D4F7AB46F6 1,15
 Key ":C-N"
-Display 80,30 EB87DBCB8E5CD8AB28B2BBBBE4B02A6E 1,16
+Display 80,30 BF37206E41B02466F99FE2103A7E1FF1 1,16
 Key ":C-N"
-Display 80,30 FFA447CF168F1FC2B8BC863AD709D026 1,18
+Display 80,30 93D2A89183D50CDC6E15954A00D2E157 1,18
 Key ":Enter"
 Display 80,30 97D6BDC69A6E76EAAB9038DFB358B2CA 1,6
 Key ":C-L"

diff --git a/tests.d/02-grep b/tests.d/02-grep
index 99b830f808e73a5381d9eb8da15e514a05679525..c4f524b289b46cf9f04661a3ece869d2ac96a583 100644 (file)
--- a/tests.d/02-grep
+++ b/tests.d/02-grep
@@ -1,26 +1,26 @@
-Display 80,30 D52D08A06C00009014A3608D0AB0AC64 1,1
+Display 80,30 0E13FF000A6039C56B47A6F5CAF58565 1,1
 Key ":C-X"
-Display 80,30 72554BDCE7C88CB96C5C31E58EEE15AB 1,1
+Display 80,30 4B286F8D524DAB672B799E321FD42B17 1,1
 Key ":C-F"
-Display 80,30 4E5F2C791D9F8BA28CC5C6EFFC46651E 49,13
+Display 80,30 70CEEB1D017973D1B50EB2B564513F53 49,13
 Key "-D"
-Display 80,30 5DF766B7398A2CB130610AB5131FF750 50,13
+Display 80,30 196BD215133B372AA30AFA60674EDE9D 50,13
 Key "-O"
-Display 80,30 06ED4A0172197BA262EC62C0F4478150 51,13
+Display 80,30 3F03EC86A756F1E774EA52F8FF22E70F 51,13
 Key "-C"
-Display 80,30 5C898562671250B081E7B483F814F1A5 52,13
+Display 80,30 BEB07FFF3787209E7B23C4A4903562B5 52,13
 Key "-/"
-Display 80,30 8FCD252C46AD9E3F5717AF1E9C558C5A 53,13
+Display 80,30 F965E5DE75688CA752FD25DBEEB857F4 53,13
 Key "-C"
-Display 80,30 EC45B65AC6C413684C061E7B7B092DD0 54,13
+Display 80,30 375B39DD167A8CC00B0B896D30BB829B 54,13
 Key "-a"
-Display 80,30 DDA12623F3277C11D4A679E7198EFCA2 55,13
+Display 80,30 D365E399A13349EB2A5DA705FCEFB7B6 55,13
 Key "-l"
-Display 80,30 3C14877ACFE783E8F05802584839D265 56,13
+Display 80,30 73BD4C2E3A30908A34EC2BFACEEBF1D5 56,13
 Key "-l"
-Display 80,30 3D727F2881B1EC33626CAB97FC26E7A9 49,13
+Display 80,30 3209ADDB40CD7972E4C313D4B50678E2 49,13
 Key "-s"
-Display 80,30 3665FCF4A2603CC23D52227F1E06F2E9 50,13
+Display 80,30 9DB6EFE696B40F33D6E4B4D5E0B0396B 50,13
 Key ":Enter"
 Display 80,30 D2E172BA8508C604111CE1A664771F3D 1,0
 Key ":C-N"
@@ -67,7 +67,6 @@ Key ":Enter"
 Display 80,30 F6604B8CA9B5A2A73DA48F8AC7CFE127 11,10
 Display 80,30 517673C86DF8C4E1F9B296BDEE0F3BE7 11,10
 Key ":Enter"
-Display 80,30 446DD5C10A088B805D54291EE0F0862D 1,1
 Display 80,30 E3ACF4433B7F90BDF1A870808B398A70 1,1
 Key ":C-X"
 Display 80,30 6480624A6FD9BE7C74F17BA5F093F3AD 1,1
@@ -126,66 +125,66 @@ Display 80,30 F9C9FE72E549531FEABF9485063DBC8C 50,13
 Key ":Backspace"
 Display 80,30 406FBC9A5E9C833AEB19DED3EEDF145A 49,13
 Key ":Enter"
-Display 80,30 0987B2F040088A421CE47BCBB0A5E60D 1,1
+Display 80,30 A0EB07F7881E7347A38952A4F217F7B1 1,1
 Key ":A-x"
-Display 80,30 7750586ACC7EF7F5471FEE00772CFBA5 26,13
+Display 80,30 06CBFF37B3E20B05110BDEBD59895F0E 26,13
 Key "-g"
-Display 80,30 BA69D6FCF7E9C546C351FBB3CF24523F 27,13
+Display 80,30 8B4415C57119B85525AD860399CB39E9 27,13
 Key "-r"
-Display 80,30 F5BFC47EC41167EAB55FAB0515010720 28,13
+Display 80,30 2CFE3824F20F5B6B92D155BD1DC9502F 28,13
 Key "-e"
-Display 80,30 903E7FB7511ADF1D5932C408BB85196D 29,13
+Display 80,30 E462F0D18CC7936E9DDB7509F8D6F0A5 29,13
 Key "-p"
-Display 80,30 0A32F51D2CFDF0DDECD5FB5A2B32E22C 30,13
+Display 80,30 467CCB01F1D1FEEBCC1138EE43784E90 30,13
 Key ":Enter"
-Display 80,30 2A14251BAB86FE0C4164D6CC1A704E1D 44,13
+Display 80,30 6E09260066D6D78B1BC0130705CE4B93 44,13
 Key "-w"
-Display 80,30 0F0A29543C4B601549AB7497DC12725D 45,13
+Display 80,30 E2C4A2F45DB9379CBEDE4DDD41118283 45,13
 Key "-i"
-Display 80,30 8332BF73F53860C7C05B09EBA3B6BA0F 46,13
+Display 80,30 0B2F9CCD0543A1DB469D5FA252DAA395 46,13
 Key "-n"
-Display 80,30 FEF762168304B739B06777980E6B5198 47,13
+Display 80,30 C5EB42F0C3AB38D99B1289DE7F9B8EEA 47,13
 Key "-d"
-Display 80,30 E2DA53FB821D75F0A9FACACE1730CFA7 48,13
+Display 80,30 D89770A40EE7E26A0781907EFF682230 48,13
 Key "-o"
-Display 80,30 1C74B84F011E9AB8BB7D139E3748C598 49,13
+Display 80,30 5D104EF7666AC8D1BD9EE901A92E9439 49,13
 Key "-w"
-Display 80,30 EF430CC85224DF70FE8B55438B904738 50,13
+Display 80,30 7DEFFB258B92B98AE2B609DADA77406D 50,13
 Key "- "
-Display 80,30 EF430CC85224DF70FE8B55438B904738 51,13
+Display 80,30 7DEFFB258B92B98AE2B609DADA77406D 51,13
 Key "-*"
-Display 80,30 BB4275300ABD145B0AB29E7C574F9BA6 52,13
+Display 80,30 590D1FEA9C1DC4A0A3134971A0017B19 52,13
 Key "-."
-Display 80,30 38844383921BD7161B301EF4883434E9 53,13
+Display 80,30 2F0A79D1A8E9C42170E6ACDBC4036FDB 53,13
 Key "-c"
-Display 80,30 E9FF6F4ECF0CD04C3431A1427B210424 54,13
+Display 80,30 8B37CDB7C79EE28983C6834371245BFD 54,13
 Key ":Enter"
-Display 80,30 142700B3B5CE49BC9E7DB9EA7B3CCDD8 11,10
-Display 80,30 69126819D74FE4A8AE563A43676680C6 11,10
+Display 80,30 DDDD07F61C5F0D383FDA92F6DE2969A4 11,10
+Display 80,30 E49A82804786F7E02600D132407D09ED 11,10
 Key ":C-N"
-Display 80,30 69126819D74FE4A8AE563A43676680C6 11,11
+Display 80,30 E49A82804786F7E02600D132407D09ED 11,11
 Key ":C-N"
-Display 80,30 69126819D74FE4A8AE563A43676680C6 11,12
+Display 80,30 E49A82804786F7E02600D132407D09ED 11,12
 Key ":C-N"
-Display 80,30 69126819D74FE4A8AE563A43676680C6 11,13
+Display 80,30 E49A82804786F7E02600D132407D09ED 11,13
 Key ":C-N"
-Display 80,30 69126819D74FE4A8AE563A43676680C6 11,14
+Display 80,30 E49A82804786F7E02600D132407D09ED 11,14
 Key ":C-N"
-Display 80,30 69126819D74FE4A8AE563A43676680C6 11,15
+Display 80,30 E49A82804786F7E02600D132407D09ED 11,15
 Key ":C-N"
-Display 80,30 69126819D74FE4A8AE563A43676680C6 11,16
+Display 80,30 E49A82804786F7E02600D132407D09ED 11,16
 Key "-f"
-Display 80,30 DE91391DDD5F68672EBEDB8B6463462D 11,12
+Display 80,30 7508884DA273FDD7CC1318E246E96FD4 11,12
 Key ":C-V"
-Display 80,30 AE5F2B3B82FAFB58CA256351B3D3FB34 11,7
+Display 80,30 82DAF36E5D195122E4EA8F5D7C1C7D96 11,7
 Key ":C-V"
-Display 80,30 13BCEDEE75730B46D2F7CB7EE1F23FD0 11,7
+Display 80,30 1D9CC071E325B5CEC7913C87D38507F9 11,7
 Key ":C-V"
-Display 80,30 BBC9D6CB8571DEF1FD2190B0F9A6CF3F 11,7
+Display 80,30 21D40D70D52854C941118DD0C7465D0B 11,7
 Key ":A-B"
-Display 80,30 0987B2F040088A421CE47BCBB0A5E60D 1,1
+Display 80,30 A0EB07F7881E7347A38952A4F217F7B1 1,1
 Key ":C-X"
-Display 80,30 6278C745BC2F70CA6AE0CA2D60DA886E 1,1
+Display 80,30 C0FECF49E05910AD47E125D7409C74D1 1,1
 Key "-`"
 Display 80,30 3E4A64EA0E43B82AE0EA2C2F26011BDF 1,6
 Key "-`"
@@ -242,4 +241,4 @@ Key ":C-X"
 Display 80,30 FA17B346317A69478E56D0FFAEE3BD13 1,7
 Key ":C-C"
 Display 80,30 C6ED20B5EF84117E136B0EEC0F58C031 1,7
-Close 862
+Close 863

diff --git a/tests.d/02-presenter b/tests.d/02-presenter
index 1ddb2f5a7f3018c48cb54849ca61eeb67bd4d3f8..d38b5ee948cad692a33058fe3e22f036e341864b 100644 (file)
--- a/tests.d/02-presenter
+++ b/tests.d/02-presenter
@@ -1,84 +1,84 @@
-Display 80,30 D52D08A06C00009014A3608D0AB0AC64 1,1
+Display 80,30 0E13FF000A6039C56B47A6F5CAF58565 1,1
 Key ":C-N"
-Display 80,30 6B1A9B827827AC1E2DAE33FD66286F70 1,2
+Display 80,30 03B92272DFB8DF74810D0B6FAB21E722 1,2
 Key ":C-N"
-Display 80,30 3CB0782907B184ACC1A12BC34CD4A940 1,3
+Display 80,30 D147F51CE14EFF4A573A8FFC149C06D0 1,3
 Key ":C-N"
-Display 80,30 89D35EB9E8C139FA641E1FCF6E763895 1,4
+Display 80,30 2C25DF65F556E89FDEE4AF0A62590A1C 1,4
 Key ":C-N"
-Display 80,30 5B63106257CE68C0B4BB83F909B7C0B4 1,5
+Display 80,30 4E1BBBF99FCFDAA42EB7B1A0494829AC 1,5
 Key ":C-N"
-Display 80,30 75EA80F3E54826ED3BAE891C21E16A79 1,6
+Display 80,30 1FF3A700863D899861A6962CDF7A3F5C 1,6
 Key "-f"
-Display 80,30 07569C7739DDF4BDE69B67F7C296108F 1,1
+Display 80,30 29C8FF3E6853239014F698D2CF797988 1,1
 Key ":C-N"
-Display 80,30 2A09C447FECA71FD06AFF518C7EFED70 1,2
+Display 80,30 DB5F55426489523B5377D7B642305FC1 1,2
 Key ":C-N"
-Display 80,30 3C1A59CD257FD442525D8B9124E150A4 1,3
+Display 80,30 E3CDA3D0D89905CD09933BED207735D9 1,3
 Key ":C-N"
-Display 80,30 F981EA2A7F54166E82EDFF278B274D5B 1,4
+Display 80,30 AB5865240C9C34D50C7FBDDFE5814ECB 1,4
 Key ":C-N"
-Display 80,30 449F212B116A01DAC1BAAF736FFF52CA 1,5
+Display 80,30 1FEF396737FF13C00AC15D43043A63D2 1,5
 Key "-f"
-Display 80,30 72B8D0A638C54E3737D9467E16EB8AC9 1,1
+Display 80,30 3102C32DFC0DA2AF8FFA2DB9F56A07D6 1,1
 Key ":C-N"
-Display 80,30 3B41C3063B7F8541E85F416DB093C5D1 1,2
+Display 80,30 318C3AD7ACF6D0CDD9D36BB640341390 1,2
 Key ":C-N"
-Display 80,30 6F3EC60E65BEABC0AA1FF76188BBFC8E 1,3
+Display 80,30 FA08C17A91E668DFB1CC5981548F65DE 1,3
 Key ":C-N"
-Display 80,30 08441AAD7024A6FD55DD805665CCEA29 1,4
+Display 80,30 5F86C08B9D26FF23AB56FA4A2254C89C 1,4
 Key ":C-N"
-Display 80,30 F4DF254BF7B4EE3651A334F744370108 1,5
+Display 80,30 69A2536A3CF5ECF1B74206AE650C31CC 1,5
 Key ":C-N"
-Display 80,30 DA66232F393284129E99FBAEA90984C4 1,6
+Display 80,30 4A3E17E74B98D6834CCF830E861E5384 1,6
 Key ":C-N"
-Display 80,30 84A53C536E4465BC26AEB39232DECD55 1,7
+Display 80,30 FEB4D566AD7ED6906B5DD80D677AC6FD 1,7
 Key ":C-N"
-Display 80,30 D40431D98760708604D662F7DA5DA384 1,8
+Display 80,30 C6CA73F5A495D34839DD8725D0111011 1,8
 Key ":C-N"
-Display 80,30 0401AA2AA2E7FA61BA2B0D2E85BB9D5E 1,9
+Display 80,30 DD3E72737C5194A32BEC13031E926554 1,9
 Key ":C-N"
-Display 80,30 C5DC0027CE4DB3013451D7B9C9A7EF93 1,10
+Display 80,30 953ACD7AA7EEE39BCD719544E9CCC911 1,10
 Key ":C-N"
-Display 80,30 7D84BB400002E5584730320A94ECE601 1,11
+Display 80,30 B99150AA11A0A36095B0A2E432F1C8BA 1,11
 Key ":C-N"
-Display 80,30 7B4CACEB2C3C1C68AA3C8D75CF825997 1,12
+Display 80,30 F7964E3BBE4A6216FCBE65D6B00E05DA 1,12
 Key ":C-N"
-Display 80,30 D223C9C5376315D611FC09E42780253A 1,13
+Display 80,30 854B3CC561EA5E484884C2053E53A6C7 1,13
 Key ":C-N"
-Display 80,30 1FC469B8143854D65CD9C24001756ADD 1,14
+Display 80,30 74BE255610ED843C98913BBA4B2B2DF3 1,14
 Key ":C-N"
-Display 80,30 45EDF554AE12A64B92E39BA4D4BF229B 1,15
+Display 80,30 48DB60DD21B06606815453D9B310F894 1,15
 Key ":C-N"
-Display 80,30 D6F61CE421406B3EA08A273B19743810 1,16
+Display 80,30 B121EB383A31116C2B609D78333C74F8 1,16
 Key ":C-N"
-Display 80,30 A28ACBC34F0074D0BD40DC10710A5098 1,17
+Display 80,30 06C1CF1A1ED9E5BFA5F58949B9B4A838 1,17
 Key ":C-N"
-Display 80,30 3C09C26FBD92E3B0A8F9B52475A0407C 1,18
+Display 80,30 8426CC1726F54BF2D0C6FEB618F08915 1,18
 Key ":C-N"
-Display 80,30 1C839AC724DEC818BE1AD1C3093EC111 1,19
+Display 80,30 9AB1B0AC0310B8576789CF66EC91DB48 1,19
 Key ":C-N"
-Display 80,30 CA8B00025B5CBF00CEF9498F4B1FE6D5 1,20
+Display 80,30 55F35CE32FDF136F02785603868C6787 1,20
 Key ":C-N"
-Display 80,30 63991868542958D0F3D3C9EB256436D7 1,21
+Display 80,30 852F815A9BA4C74AC74249CC07DE8E4C 1,21
 Key ":C-N"
-Display 80,30 AA559F614109293B11006D26E6A8F241 1,22
+Display 80,30 072FC90622A2B78731248B427F7DCEB6 1,22
 Key ":C-X"
-Display 80,30 7E282C461DBFFADFF49A20AB08608A20 1,22
+Display 80,30 13A78D78CBB149DE4A88D43E4B1DD1F7 1,22
 Key "-3"
-Display 80,30 B67E4C6C3CEA8F82095DEA21A197F657 1,22
+Display 80,30 79CABDCE129CCC5631D335926D11361F 1,22
 Key ":C-E"
-Display 80,30 038A177F159B8B2D263241B03820BD07 33,22
+Display 80,30 A3B2B96B6F1C4A32469BF82D0F1CCB13 33,22
 Key "-p"
-Display 80,30 D7FA05B947F525B231E1DC97D1F9A8AD 33,22
+Display 80,30 B57163AC6C9D54000BD7F5C6D51FE0D0 33,22
 Key "-P"
-Display 80,30 5A7DC5EB785739D4FA2A7BD0958A8E26 33,22
+Display 80,30 D31AC62C35DF3C5E1E2390657E33056A 33,22
 Key ":C-X"
-Display 80,30 4831E2CA659B02BD1CEC08B521E0585B 33,22
+Display 80,30 B5F8698390E5255954777C8F8D728A7C 33,22
 Key "-o"
-Display 80,30 5A7DC5EB785739D4FA2A7BD0958A8E26 41,16
+Display 80,30 D31AC62C35DF3C5E1E2390657E33056A 41,16
 Key ":C-E"
-Display 80,30 BE98479F701C043184E0D93DDABC3106 73,16
+Display 80,30 A519C11700573F563006C99DA6C7D431 73,16
 Key ":Enter"
 Display 80,30 6622A2FFF7AF5BD68E9D0A4A90D95A3D 41,0
 Key ":C-N"

diff --git a/tests.d/02-spell b/tests.d/02-spell
index 215fc5676a7fc1525fc1b4108e189f16af2cb667..f0e159e83d2be3120041020bf6353fff7103d000 100644 (file)
--- a/tests.d/02-spell
+++ b/tests.d/02-spell
@@ -1,18 +1,18 @@
-Display 80,30 D52D08A06C00009014A3608D0AB0AC64 1,1
+Display 80,30 0E13FF000A6039C56B47A6F5CAF58565 1,1
 Key ":C-N"
-Display 80,30 6B1A9B827827AC1E2DAE33FD66286F70 1,2
+Display 80,30 03B92272DFB8DF74810D0B6FAB21E722 1,2
 Key ":C-N"
-Display 80,30 3CB0782907B184ACC1A12BC34CD4A940 1,3
+Display 80,30 D147F51CE14EFF4A573A8FFC149C06D0 1,3
 Key ":C-N"
-Display 80,30 89D35EB9E8C139FA641E1FCF6E763895 1,4
+Display 80,30 2C25DF65F556E89FDEE4AF0A62590A1C 1,4
 Key ":C-N"
-Display 80,30 5B63106257CE68C0B4BB83F909B7C0B4 1,5
+Display 80,30 4E1BBBF99FCFDAA42EB7B1A0494829AC 1,5
 Key ":C-N"
-Display 80,30 75EA80F3E54826ED3BAE891C21E16A79 1,6
+Display 80,30 1FF3A700863D899861A6962CDF7A3F5C 1,6
 Key ":C-N"
-Display 80,30 16C15C096FC13D531BBE071C7B751EF3 1,7
+Display 80,30 8BCEF4D94B8E0CD00A572C405BFCD16A 1,7
 Key ":C-N"
-Display 80,30 B8B40E4F4A1EAEC1C6E233D195894D9F 1,8
+Display 80,30 9C096A8B2633F1429AB22345C20B3B33 1,8
 Key "-f"
 Display 80,30 8F30DCB483C65D442FBEFA53E624FBB8 1,0
 Key ":A-x"