trunk: resume before the Reload experiment

Empty marker on the last pre-Reload change. Keep the Reload experiment on reload (3801914), its first change on reload-start (200a1fc), and the unfinished performance investigation on reload-perf-wip.

1 files changed, 56 insertions, 54 deletions

diff --git a/test/snapshots/psearch.golden b/test/snapshots/psearch.golden
index 8dfcd2b3..d1a28996 100644
--- a/test/snapshots/psearch.golden
+++ b/test/snapshots/psearch.golden
@@ -1,60 +1,62 @@
-== snap output grid=140x30 cursor=4,8
-|New Newcol Joincol Find Grep Help Changelog Tutor Dump NextColor Debug Kill
-|  /tmp/pardes-snap/psearch/cwd                                                                Save New Newtty Del Filter
+== snap output grid=140x31 cursor=4,9
+|Newcol Joincol Find Grep Help Changelog Tutor Dump NextColor Debug Kill
+|New Tty Find Grep Joincol
+|  /tmp/pardes-snap/psearch/cwd Save Tty Del Togglettymode Filter Collapse
 |  printf 'x MA''RK a\nzz\nx MA''RK b\nzz\nx MA''RK c\n'
 |  x MARK a
 |  zz
 |  x MARK b
 |  zz
 |  x MARK c
-== snap typing grid=140x30 cursor=8,29
-|29:    /MARK
-== snap results grid=140x30 cursor=7,3
-|26:   /tmp/pardes-snap/psearch/cwd/+Search                                                               Save New Newtty Del
-|27:      1 @p0:2:3-6 x MARK a
-|28:      2 @p0:4:3-6 x MARK b
-|29:      3 @p0:6:3-6 x MARK c
-== style results grid=140x30
-|0: 0-74 #949494,#121212, 75-139 d,#121212,
-|1: 0-1 #ffffff,#626262, 2-119 #949494,#121212, 120-139 d,#121212,
-|2: 0-0 d,#444444, 1-1 d,#080808, 2-139 #bdbdbd,#080808,
-|3: 0-0 d,#444444, 1-1 d,#080808, 2-3 #bdbdbd,#080808, 4-7 #080808,#80a0ff, 8-139 #bdbdbd,#080808,
-|4: 0-0 d,#444444, 1-1 d,#080808, 2-139 #bdbdbd,#080808,
-|5: 0-0 d,#444444, 1-1 d,#080808, 2-139 #bdbdbd,#080808,
-|6: 0-0 d,#444444, 1-1 d,#080808, 2-139 #bdbdbd,#080808,
-|7: 0-0 d,#444444, 1-1 d,#080808, 2-139 #bdbdbd,#080808,
-|8: 0-0 d,#444444, 1-139 d,#080808,
-|9: 0-0 d,#444444, 1-1 d,#080808, 2-139 #bdbdbd,#080808,
-|10: 0-0 d,#444444, 1-1 d,#080808, 2-139 #bdbdbd,#080808,
-|11: 0-0 d,#444444, 1-1 d,#080808, 2-139 #bdbdbd,#080808,
-|12: 0-0 d,#444444, 1-1 d,#080808, 2-139 #bdbdbd,#080808,
-|13: 0-0 d,#444444, 1-1 d,#080808, 2-139 #bdbdbd,#080808,
-|14: 0-0 d,#444444, 1-1 d,#080808, 2-139 #bdbdbd,#080808,
-|15: 0-0 d,#444444, 1-1 d,#080808, 2-139 #bdbdbd,#080808,
-|16: 0-0 d,#444444, 1-1 d,#080808, 2-139 #bdbdbd,#080808,
-|17: 0-0 d,#444444, 1-1 d,#080808, 2-139 #bdbdbd,#080808,
-|18: 0-0 d,#444444, 1-1 d,#080808, 2-139 #bdbdbd,#080808,
-|19: 0-0 d,#444444, 1-1 d,#080808, 2-139 #bdbdbd,#080808,
-|20: 0-0 d,#444444, 1-1 d,#080808, 2-139 #bdbdbd,#080808,
-|21: 0-0 d,#444444, 1-1 d,#080808, 2-139 #bdbdbd,#080808,
-|22: 0-0 d,#444444, 1-1 d,#080808, 2-139 #bdbdbd,#080808,
-|23: 0-0 d,#444444, 1-1 d,#080808, 2-139 #bdbdbd,#080808,
-|24: 0-0 d,#444444, 1-1 d,#080808, 2-139 #bdbdbd,#080808,
-|25: 0-0 d,#444444, 1-1 d,#080808, 2-139 #bdbdbd,#080808,
-|26: 0-1 #ffffff,#262626, 2-119 #949494,#121212, 120-139 d,#121212,
-|27: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-24 #bdbdbd,#080808, 25-139 d,#080808,
-|28: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-24 #bdbdbd,#080808, 25-139 d,#080808,
-|29: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-24 #bdbdbd,#080808, 25-139 d,#080808,
-== snap second grid=140x30 cursor=7,5
-== snap back grid=140x30 cursor=7,3
-== snap nomatch grid=140x30 cursor=7,28
-|24:   /tmp/pardes-snap/psearch/cwd/+Search                                                               Save New Newtty Del
-|25:      1
-== snap ttyinert grid=140x30 cursor=4,8
-|1: $ /tmp/pardes-snap/psearch/cwd                                                                Save New Newtty Del Filter
-|2:   $ printf 'x MA''RK a\nzz\nx MA''RK b\nzz\nx MA''RK c\n'
-|8:   $
-== snap rightsearch grid=140x30 cursor=7,5
-|1:   /tmp/pardes-snap/psearch/cwd                                                                Save New Newtty Del Filter
-|2:   printf 'x MA''RK a\nzz\nx MA''RK b\nzz\nx MA''RK c\n'
-|8:
+== snap typing grid=140x31 cursor=8,30
+|30:    /MARK
+== snap results grid=140x31 cursor=7,4
+|27:   /tmp/pardes-snap/psearch/cwd/+Search Save Tty Del Collapse
+|28:      1 @p0:2:3-6 x MARK a
+|29:      2 @p0:4:3-6 x MARK b
+|30:      3 @p0:6:3-6 x MARK c
+== style results grid=140x31
+|0: 0-70 #b2c3b8,#1d2824, 71-139 d,#1d2824,
+|1: 0-24 #becfc4,#26362d, 25-139 d,#26362d,
+|2: 0-1 #000000,#adcc91, 2-72 #becfc4,#26362d, 73-139 d,#26362d,
+|3: 0-0 d,#637f6a, 1-1 d,#0d1410, 2-139 #e5eee5,#0d1410,
+|4: 0-0 d,#637f6a, 1-1 d,#0d1410, 2-3 #e5eee5,#0d1410, 4-7 #f5f7ee,#405d4b, 8-139 #e5eee5,#0d1410,
+|5: 0-0 d,#637f6a, 1-1 d,#0d1410, 2-139 #e5eee5,#0d1410,
+|6: 0-0 d,#637f6a, 1-1 d,#0d1410, 2-139 #e5eee5,#0d1410,
+|7: 0-0 d,#637f6a, 1-1 d,#0d1410, 2-139 #e5eee5,#0d1410,
+|8: 0-0 d,#637f6a, 1-1 d,#0d1410, 2-139 #e5eee5,#0d1410,
+|9: 0-0 d,#637f6a, 1-139 d,#0d1410,
+|10: 0-0 d,#637f6a, 1-1 d,#0d1410, 2-139 #e5eee5,#0d1410,
+|11: 0-0 d,#637f6a, 1-1 d,#0d1410, 2-139 #e5eee5,#0d1410,
+|12: 0-0 d,#637f6a, 1-1 d,#0d1410, 2-139 #e5eee5,#0d1410,
+|13: 0-0 d,#637f6a, 1-1 d,#0d1410, 2-139 #e5eee5,#0d1410,
+|14: 0-0 d,#637f6a, 1-1 d,#0d1410, 2-139 #e5eee5,#0d1410,
+|15: 0-0 d,#637f6a, 1-1 d,#0d1410, 2-139 #e5eee5,#0d1410,
+|16: 0-0 d,#637f6a, 1-1 d,#0d1410, 2-139 #e5eee5,#0d1410,
+|17: 0-0 d,#637f6a, 1-1 d,#0d1410, 2-139 #e5eee5,#0d1410,
+|18: 0-0 d,#637f6a, 1-1 d,#0d1410, 2-139 #e5eee5,#0d1410,
+|19: 0-0 d,#637f6a, 1-1 d,#0d1410, 2-139 #e5eee5,#0d1410,
+|20: 0-0 d,#637f6a, 1-1 d,#0d1410, 2-139 #e5eee5,#0d1410,
+|21: 0-0 d,#637f6a, 1-1 d,#0d1410, 2-139 #e5eee5,#0d1410,
+|22: 0-0 d,#637f6a, 1-1 d,#0d1410, 2-139 #e5eee5,#0d1410,
+|23: 0-0 d,#637f6a, 1-1 d,#0d1410, 2-139 #e5eee5,#0d1410,
+|24: 0-0 d,#637f6a, 1-1 d,#0d1410, 2-139 #e5eee5,#0d1410,
+|25: 0-0 d,#637f6a, 1-1 d,#0d1410, 2-139 #e5eee5,#0d1410,
+|26: 0-0 d,#637f6a, 1-1 d,#0d1410, 2-139 #e5eee5,#0d1410,
+|27: 0-1 #ffffff,#4c6356, 2-59 #b2c3b8,#1d2824, 60-139 d,#1d2824,
+|28: 0-0 d,#637f6a, 1-1 d,#0d1410, 2-15 #59675c,#0d1410, 16-18 #e5eee5,#0d1410, 19-22 #f7e4a5,#57472a, 23-24 #e5eee5,#0d1410, 25-139 d,#0d1410,
+|29: 0-0 d,#637f6a, 1-1 d,#0d1410, 2-15 #59675c,#0d1410, 16-18 #e5eee5,#0d1410, 19-22 #f7e4a5,#57472a, 23-24 #e5eee5,#0d1410, 25-139 d,#0d1410,
+|30: 0-0 d,#152019, 1-1 d,#0d1410, 2-15 #59675c,#0d1410, 16-18 #e5eee5,#0d1410, 19-22 #f7e4a5,#57472a, 23-24 #e5eee5,#0d1410, 25-139 d,#0d1410,
+== snap second grid=140x31 cursor=7,6
+== snap back grid=140x31 cursor=7,4
+== snap nomatch grid=140x31 cursor=7,29
+|25:   /tmp/pardes-snap/psearch/cwd/+Search Save Tty Del Collapse
+|26:      1
+== snap ttyinert grid=140x31 cursor=4,9
+|2: $ /tmp/pardes-snap/psearch/cwd Save Tty Del Togglettymode Filter Collapse
+|3:   $ printf 'x MA''RK a\nzz\nx MA''RK b\nzz\nx MA''RK c\n'
+|9:   $
+== snap rightsearch grid=140x31 cursor=7,6
+|2:   /tmp/pardes-snap/psearch/cwd Save Tty Del Togglettymode Filter Collapse
+|3:   printf 'x MA''RK a\nzz\nx MA''RK b\nzz\nx MA''RK c\n'
+|9: