code.delx.au - gnu-emacs-elpa/commit

]> code.delx.au - gnu-emacs-elpa/commit

delx.au / code / gnu-emacs-elpa / commit

author	Jackson Ray Hamilton <jackson@jacksonrayhamilton.com>
	Mon, 30 May 2016 22:09:33 +0000 (15:09 -0700)
committer	Jackson Ray Hamilton <jackson@jacksonrayhamilton.com>
	Mon, 30 May 2016 22:09:33 +0000 (15:09 -0700)
commit	6ee448148df13dc0fa96e3cc3305fd00ea7c8be8
tree	e5c4a2ca924718dbf7a7642a2df40d49df2afdcc	tree
parent	5f6e9e79451c2c257678a099a796951a64f493a4	commit \| diff
parent	3007b2917d71a7d66eb94876536dfd80b0661d40	commit \| diff

Merge commit '3007b2917d71a7d66eb94876536dfd80b0661d40' from context-coloring

51 files changed:

packages/context-coloring/.elpaignore	\|	diff2 \|	blob \| history
packages/context-coloring/.gitignore	diff1 \|	\|	blob \| history
packages/context-coloring/Cask	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/Makefile	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/context-coloring-benchmark.el	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/context-coloring-coverage.el	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/context-coloring-emacs-lisp.el	\|	diff2 \|	blob \| history
packages/context-coloring/context-coloring-javascript.el	\|	diff2 \|	blob \| history
packages/context-coloring/context-coloring-test.el	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/context-coloring.el	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/.nosearch	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/benchmark/.dir-locals.el	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/benchmark/async-0.9.0.js	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/benchmark/faces.el	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/benchmark/jquery-2.1.1.js	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/benchmark/lisp.el	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/benchmark/lodash-2.4.1.js	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/benchmark/mkdirp-0.5.0.js	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/benchmark/simple.el	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/benchmark/subr.el	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/test/block-scopes.js	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/test/catch.js	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/test/changed.el	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/test/comment.el	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/test/comments-and-strings.js	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/test/cond.el	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/test/condition-case.el	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/test/defadvice.el	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/test/defun.el	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/test/dolist.el	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/test/empty	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/test/empty-varlist.el	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/test/function-scopes.js	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/test/global.js	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/test/ignored.el	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/test/initial-level.js	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/test/iteration.el	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/test/key-names.js	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/test/key-values.js	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/test/lambda.el	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/test/let-star.el	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/test/let.el	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/test/macroexp-let2.el	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/test/property-lookup.js	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/test/quote.el	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/test/sexp.el	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/test/splice.el	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/test/string.el	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/test/unbalanced-parenthesis.el	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/test/unterminated-comment.js	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/test/varlist-spacing.el	diff1 \|	diff2 \|	blob \| history

RSS Atom

packages/context-coloring/.elpaignore	\|	diff2 \|	blob \| history
packages/context-coloring/.gitignore	diff1 \|	\|	blob \| history
packages/context-coloring/Cask	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/Makefile	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/context-coloring-benchmark.el	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/context-coloring-coverage.el	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/context-coloring-emacs-lisp.el	\|	diff2 \|	blob \| history
packages/context-coloring/context-coloring-javascript.el	\|	diff2 \|	blob \| history
packages/context-coloring/context-coloring-test.el	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/context-coloring.el	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/.nosearch	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/benchmark/.dir-locals.el	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/benchmark/async-0.9.0.js	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/benchmark/faces.el	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/benchmark/jquery-2.1.1.js	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/benchmark/lisp.el	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/benchmark/lodash-2.4.1.js	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/benchmark/mkdirp-0.5.0.js	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/benchmark/simple.el	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/benchmark/subr.el	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/test/block-scopes.js	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/test/catch.js	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/test/changed.el	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/test/comment.el	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/test/comments-and-strings.js	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/test/cond.el	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/test/condition-case.el	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/test/defadvice.el	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/test/defun.el	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/test/dolist.el	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/test/empty	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/test/empty-varlist.el	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/test/function-scopes.js	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/test/global.js	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/test/ignored.el	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/test/initial-level.js	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/test/iteration.el	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/test/key-names.js	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/test/key-values.js	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/test/lambda.el	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/test/let-star.el	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/test/let.el	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/test/macroexp-let2.el	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/test/property-lookup.js	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/test/quote.el	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/test/sexp.el	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/test/splice.el	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/test/string.el	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/test/unbalanced-parenthesis.el	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/test/unterminated-comment.js	diff1 \|	diff2 \|	blob \| history
packages/context-coloring/fixtures/test/varlist-spacing.el	diff1 \|	diff2 \|	blob \| history