From: Jackson Ray Hamilton Date: Tue, 5 May 2015 11:09:15 +0000 (-0700) Subject: Merge commit '283a006be8e96c7e011dedddb460b289d335a9fb' from context-coloring X-Git-Url: https://code.delx.au/gnu-emacs-elpa/commitdiff_plain/8a083d5bfb1e4c97880879569a43d1eaa22f43db Merge commit '283a006be8e96c7e011dedddb460b289d335a9fb' from context-coloring --- 8a083d5bfb1e4c97880879569a43d1eaa22f43db diff --cc packages/context-coloring/.gitignore index f0903181e,000000000..a269508e6 mode 100644,000000..100644 --- a/packages/context-coloring/.gitignore +++ b/packages/context-coloring/.gitignore @@@ -1,3 -1,0 +1,4 @@@ +*.elc ++.cask/ +/benchmark/logs/ - /libraries/ ++/test/coverage/ diff --cc packages/context-coloring/Cask index 000000000,db61c1c97..db61c1c97 mode 000000,100644..100644 --- a/packages/context-coloring/Cask +++ b/packages/context-coloring/Cask diff --cc packages/context-coloring/test/binaries/noop index 000000000,a35b5513d..a35b5513d mode 000000,100644..100644 --- a/packages/context-coloring/test/binaries/noop +++ b/packages/context-coloring/test/binaries/noop diff --cc packages/context-coloring/test/context-coloring-coverage.el index 000000000,2fe8fa905..2fe8fa905 mode 000000,100644..100644 --- a/packages/context-coloring/test/context-coloring-coverage.el +++ b/packages/context-coloring/test/context-coloring-coverage.el diff --cc packages/context-coloring/test/fixtures/empty index 000000000,e69de29bb..e69de29bb mode 000000,100644..100644 --- a/packages/context-coloring/test/fixtures/empty +++ b/packages/context-coloring/test/fixtures/empty diff --cc packages/context-coloring/test/fixtures/unterminated-comment.js index 000000000,94d4703cb..94d4703cb mode 000000,100644..100644 --- a/packages/context-coloring/test/fixtures/unterminated-comment.js +++ b/packages/context-coloring/test/fixtures/unterminated-comment.js