Merge commit '40f67bf039c143758ac070f9693bb0af87b98aba' from context-coloring

diff --cc packages/context-coloring/Makefile
Simple merge

diff --cc packages/context-coloring/README.md
Simple merge

diff --cc packages/context-coloring/benchmark/context-coloring-benchmark.el
Simple merge

diff --cc packages/context-coloring/benchmark/fixtures/faces.el
index 0000000000000000000000000000000000000000,5176bedf13af481ab76039b23d4c87492bb47059..5176bedf13af481ab76039b23d4c87492bb47059
mode 000000,100644..100644
--- /dev/null
--- 2/benchmark/fixtures/faces.el
+++ b/packages/context-coloring/benchmark/fixtures/faces.el

diff --cc packages/context-coloring/benchmark/fixtures/lisp.el
index 0000000000000000000000000000000000000000,f8ca6f6a172192e707a3d5a9250cb0e6c725b562..f8ca6f6a172192e707a3d5a9250cb0e6c725b562
mode 000000,100644..100644
--- /dev/null
--- 2/benchmark/fixtures/lisp.el
+++ b/packages/context-coloring/benchmark/fixtures/lisp.el

diff --cc packages/context-coloring/benchmark/fixtures/simple.el
index 0000000000000000000000000000000000000000,5e5cd877e9b343a8e0a3a4bcaa1500bffe656e68..5e5cd877e9b343a8e0a3a4bcaa1500bffe656e68
mode 000000,100644..100644
--- /dev/null
--- 2/benchmark/fixtures/simple.el
+++ b/packages/context-coloring/benchmark/fixtures/simple.el

diff --cc packages/context-coloring/benchmark/fixtures/subr.el
index 0000000000000000000000000000000000000000,a48038fa12b17bc7f60ee6edde38ae0980b839b8..a48038fa12b17bc7f60ee6edde38ae0980b839b8
mode 000000,100644..100644
--- /dev/null
--- 2/benchmark/fixtures/subr.el
+++ b/packages/context-coloring/benchmark/fixtures/subr.el

diff --cc packages/context-coloring/context-coloring.el
Simple merge

diff --cc packages/context-coloring/test/context-coloring-coverage.el
Simple merge

diff --cc packages/context-coloring/test/context-coloring-test.el
Simple merge

diff --cc packages/context-coloring/test/fixtures/changed.el
index 0000000000000000000000000000000000000000,28c9602c79b094dc6d0472b9cf9c8e949bc5a225..28c9602c79b094dc6d0472b9cf9c8e949bc5a225
mode 000000,100644..100644
--- /dev/null
--- 2/test/fixtures/changed.el
+++ b/packages/context-coloring/test/fixtures/changed.el

diff --cc packages/context-coloring/test/fixtures/cond.el
index 0000000000000000000000000000000000000000,d5aae5b2fae7d1231570d180566da193cfc0286f..d5aae5b2fae7d1231570d180566da193cfc0286f
mode 000000,100644..100644
--- /dev/null
--- 2/test/fixtures/cond.el
+++ b/packages/context-coloring/test/fixtures/cond.el

diff --cc packages/context-coloring/test/fixtures/condition-case.el
index 0000000000000000000000000000000000000000,151f5911ac40bc8a617f191013fe23267cdfc38d..151f5911ac40bc8a617f191013fe23267cdfc38d
mode 000000,100644..100644
--- /dev/null
--- 2/test/fixtures/condition-case.el
+++ b/packages/context-coloring/test/fixtures/condition-case.el

diff --cc packages/context-coloring/test/fixtures/defadvice.el
index 0000000000000000000000000000000000000000,da1f0ebd64b70aee6244896384c45c134a435111..da1f0ebd64b70aee6244896384c45c134a435111
mode 000000,100644..100644
--- /dev/null
--- 2/test/fixtures/defadvice.el
+++ b/packages/context-coloring/test/fixtures/defadvice.el

diff --cc packages/context-coloring/test/fixtures/defun.el
Simple merge

diff --cc packages/context-coloring/test/fixtures/dolist.el
index 0000000000000000000000000000000000000000,f103670a0f2a928997c6db8b7a7a76cd9d93f9fd..f103670a0f2a928997c6db8b7a7a76cd9d93f9fd
mode 000000,100644..100644
--- /dev/null
--- 2/test/fixtures/dolist.el
+++ b/packages/context-coloring/test/fixtures/dolist.el

diff --cc packages/context-coloring/test/fixtures/ignored.el
Simple merge

diff --cc packages/context-coloring/test/fixtures/let.el
Simple merge

diff --cc packages/context-coloring/test/fixtures/quote.el
Simple merge

diff --cc packages/context-coloring/test/fixtures/sexp.el
index 0000000000000000000000000000000000000000,438dc021cfd80e9d5ddc1c3e7bd32273fe574062..438dc021cfd80e9d5ddc1c3e7bd32273fe574062
mode 000000,100644..100644
--- /dev/null
--- 2/test/fixtures/sexp.el
+++ b/packages/context-coloring/test/fixtures/sexp.el

diff --cc packages/context-coloring/test/fixtures/splice.el
index 0000000000000000000000000000000000000000,3a857a7b2681fde514761d5a6447906df1e0795a..3a857a7b2681fde514761d5a6447906df1e0795a
mode 000000,100644..100644
--- /dev/null
--- 2/test/fixtures/splice.el
+++ b/packages/context-coloring/test/fixtures/splice.el

diff --cc packages/context-coloring/test/fixtures/unbalanced-parenthesis.el
index 0000000000000000000000000000000000000000,caaf7e2b96ec51d62856c458d69cbc58ee8de06e..caaf7e2b96ec51d62856c458d69cbc58ee8de06e
mode 000000,100644..100644
--- /dev/null
--- 2/test/fixtures/unbalanced-parenthesis.el
+++ b/packages/context-coloring/test/fixtures/unbalanced-parenthesis.el