Merge commit '3bf805df83fe6f110f3e7e8ce2dc37e0cf6c14cb' from context-coloring

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

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

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

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

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

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

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

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

diff --cc packages/context-coloring/test/fixtures/let*.el
index 0000000000000000000000000000000000000000,44d743ce6ce2e752902c0164234012e005e0ac4d..44d743ce6ce2e752902c0164234012e005e0ac4d
mode 000000,100644..100644
--- /dev/null
--- 2/test/fixtures/let*.el
+++ b/packages/context-coloring/test/fixtures/let*.el

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

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

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