From: Jackson Ray Hamilton <jackson@jacksonrayhamilton.com>
Date: Mon, 30 May 2016 22:09:33 +0000 (-0700)
Subject: Merge commit '3007b2917d71a7d66eb94876536dfd80b0661d40' from context-coloring
X-Git-Url: https://code.delx.au/gnu-emacs-elpa/commitdiff_plain/6ee448148df13dc0fa96e3cc3305fd00ea7c8be8

Merge commit '3007b2917d71a7d66eb94876536dfd80b0661d40' from context-coloring
---

6ee448148df13dc0fa96e3cc3305fd00ea7c8be8
diff --cc packages/context-coloring/.elpaignore
index 000000000,bad5d87de..bad5d87de
mode 000000,100644..100644
--- a/packages/context-coloring/.elpaignore
+++ b/packages/context-coloring/.elpaignore
diff --cc packages/context-coloring/.gitignore
index a269508e6,000000000..b9fedcaef
mode 100644,000000..100644
--- a/packages/context-coloring/.gitignore
+++ b/packages/context-coloring/.gitignore
@@@ -1,4 -1,0 +1,6 @@@
++*-autoloads.el
++*-pkg.el
 +*.elc
 +.cask/
- /benchmark/logs/
- /test/coverage/
++/benchmark/
++/coverage/
diff --cc packages/context-coloring/context-coloring-emacs-lisp.el
index 000000000,05caa5aa8..05caa5aa8
mode 000000,100644..100644
--- a/packages/context-coloring/context-coloring-emacs-lisp.el
+++ b/packages/context-coloring/context-coloring-emacs-lisp.el
diff --cc packages/context-coloring/context-coloring-javascript.el
index 000000000,d145184be..d145184be
mode 000000,100644..100644
--- a/packages/context-coloring/context-coloring-javascript.el
+++ b/packages/context-coloring/context-coloring-javascript.el