From: Jackson Ray Hamilton Date: Mon, 18 May 2015 09:50:15 +0000 (-0700) Subject: Merge commit '3bf805df83fe6f110f3e7e8ce2dc37e0cf6c14cb' from context-coloring X-Git-Url: https://code.delx.au/gnu-emacs-elpa/commitdiff_plain/b525e2d04fd260fb6ccebb3355583329edde24f3 Merge commit '3bf805df83fe6f110f3e7e8ce2dc37e0cf6c14cb' from context-coloring --- b525e2d04fd260fb6ccebb3355583329edde24f3 diff --cc packages/context-coloring/test/fixtures/comment.el index 000000000,c3ba432aa..c3ba432aa mode 000000,100644..100644 --- a/packages/context-coloring/test/fixtures/comment.el +++ b/packages/context-coloring/test/fixtures/comment.el diff --cc packages/context-coloring/test/fixtures/defun.el index 000000000,a5bd039b7..a5bd039b7 mode 000000,100644..100644 --- a/packages/context-coloring/test/fixtures/defun.el +++ b/packages/context-coloring/test/fixtures/defun.el diff --cc packages/context-coloring/test/fixtures/ignored.el index 000000000,776a846d8..776a846d8 mode 000000,100644..100644 --- a/packages/context-coloring/test/fixtures/ignored.el +++ b/packages/context-coloring/test/fixtures/ignored.el diff --cc packages/context-coloring/test/fixtures/iteration.el index 000000000,c4e99aca6..c4e99aca6 mode 000000,100644..100644 --- a/packages/context-coloring/test/fixtures/iteration.el +++ b/packages/context-coloring/test/fixtures/iteration.el diff --cc packages/context-coloring/test/fixtures/lambda.el index 000000000,9ab7be277..9ab7be277 mode 000000,100644..100644 --- a/packages/context-coloring/test/fixtures/lambda.el +++ b/packages/context-coloring/test/fixtures/lambda.el diff --cc packages/context-coloring/test/fixtures/let*.el index 000000000,44d743ce6..44d743ce6 mode 000000,100644..100644 --- a/packages/context-coloring/test/fixtures/let*.el +++ b/packages/context-coloring/test/fixtures/let*.el diff --cc packages/context-coloring/test/fixtures/let.el index 000000000,11637b133..11637b133 mode 000000,100644..100644 --- a/packages/context-coloring/test/fixtures/let.el +++ b/packages/context-coloring/test/fixtures/let.el diff --cc packages/context-coloring/test/fixtures/quote.el index 000000000,654bc705b..654bc705b mode 000000,100644..100644 --- a/packages/context-coloring/test/fixtures/quote.el +++ b/packages/context-coloring/test/fixtures/quote.el diff --cc packages/context-coloring/test/fixtures/string.el index 000000000,417264214..417264214 mode 000000,100644..100644 --- a/packages/context-coloring/test/fixtures/string.el +++ b/packages/context-coloring/test/fixtures/string.el